st: Don't shadow existing variables

This commit is contained in:
Florian Müllner 2015-09-23 19:59:23 +02:00
parent 18b6f13395
commit a025b151ef
2 changed files with 2 additions and 5 deletions

View File

@ -383,9 +383,6 @@ _st_create_shadow_pipeline (StShadow *shadow_spec,
if (G_UNLIKELY (shadow_pipeline_template == NULL)) if (G_UNLIKELY (shadow_pipeline_template == NULL))
{ {
CoglContext *ctx =
clutter_backend_get_cogl_context (clutter_get_default_backend ());
shadow_pipeline_template = cogl_pipeline_new (ctx); shadow_pipeline_template = cogl_pipeline_new (ctx);
/* We set up the pipeline to blend the shadow texture with the combine /* We set up the pipeline to blend the shadow texture with the combine

View File

@ -3016,7 +3016,7 @@ st_theme_node_get_border_image (StThemeNode *node)
CRStyleSheet *base_stylesheet; CRStyleSheet *base_stylesheet;
int borders[4]; int borders[4];
int n_borders = 0; int n_borders = 0;
int i; int j;
const char *url; const char *url;
int border_top; int border_top;
@ -3046,7 +3046,7 @@ st_theme_node_get_border_image (StThemeNode *node)
/* Followed by 0 to 4 numbers or percentages. *Not lengths*. The interpretation /* Followed by 0 to 4 numbers or percentages. *Not lengths*. The interpretation
* of a number is supposed to be pixels if the image is pixel based, otherwise CSS pixels. * of a number is supposed to be pixels if the image is pixel based, otherwise CSS pixels.
*/ */
for (i = 0; i < 4; i++) for (j = 0; j < 4; j++)
{ {
if (term == NULL) if (term == NULL)
break; break;