diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2015-09-23 19:59:23 +0200 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2015-09-23 21:32:50 +0200 |
| commit | a025b151efa892ede252af851a6d484fc8f0d8dd (patch) | |
| tree | 59ef881dc7044d125ea7c8b88f3dda5ba4a9fb4a | |
| parent | 18b6f133952d5bb4e5af31507f0dbd17ac6500eb (diff) | |
| download | gnome-shell-a025b151efa892ede252af851a6d484fc8f0d8dd.tar.gz | |
st: Don't shadow existing variables
| -rw-r--r-- | src/st/st-private.c | 3 | ||||
| -rw-r--r-- | src/st/st-theme-node.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/st/st-private.c b/src/st/st-private.c index f27955c8d..c842be0cf 100644 --- a/src/st/st-private.c +++ b/src/st/st-private.c @@ -383,9 +383,6 @@ _st_create_shadow_pipeline (StShadow *shadow_spec, 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); /* We set up the pipeline to blend the shadow texture with the combine diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c index 7437fd05c..d71466c5a 100644 --- a/src/st/st-theme-node.c +++ b/src/st/st-theme-node.c @@ -3016,7 +3016,7 @@ st_theme_node_get_border_image (StThemeNode *node) CRStyleSheet *base_stylesheet; int borders[4]; int n_borders = 0; - int i; + int j; const char *url; 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 * 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) break; |