summaryrefslogtreecommitdiff
path: root/gtk/gtkbuilder-menus.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-05-30 21:24:03 -0400
committerMatthias Clasen <mclasen@redhat.com>2015-06-02 09:08:15 -0400
commit1f525e263eb9561e22990f3b991f0408d24f8d65 (patch)
treebbe89ecde756b8358914c2d066634ce1151727a4 /gtk/gtkbuilder-menus.c
parent75f0146c69a90f40f20def87c961be361dcd9754 (diff)
downloadgtk+-1f525e263eb9561e22990f3b991f0408d24f8d65.tar.gz
builder: Fix compiler warnings
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
Diffstat (limited to 'gtk/gtkbuilder-menus.c')
-rw-r--r--gtk/gtkbuilder-menus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkbuilder-menus.c b/gtk/gtkbuilder-menus.c
index 8a42faa9f9..2259cd076d 100644
--- a/gtk/gtkbuilder-menus.c
+++ b/gtk/gtkbuilder-menus.c
@@ -163,11 +163,11 @@ gtk_builder_menu_start_element (GMarkupParseContext *context,
{
const gchar *typestr;
const gchar *name;
- const gchar *context;
+ const gchar *ctxt;
if (COLLECT (STRING, "name", &name,
OPTIONAL | BOOLEAN, "translatable", &state->translatable,
- OPTIONAL | STRING, "context", &context,
+ OPTIONAL | STRING, "context", &ctxt,
OPTIONAL | STRING, "comments", NULL, /* ignore, just for translators */
OPTIONAL | STRING, "type", &typestr))
{
@@ -182,7 +182,7 @@ gtk_builder_menu_start_element (GMarkupParseContext *context,
state->type = typestr ? g_variant_type_new (typestr) : NULL;
state->string = g_string_new (NULL);
state->attribute = g_strdup (name);
- state->context = g_strdup (context);
+ state->context = g_strdup (ctxt);
gtk_builder_menu_push_frame (state, NULL, NULL);
}