[gtk+] builder: Fix compiler warnings
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] builder: Fix compiler warnings
- Date: Tue, 2 Jun 2015 13:10:25 +0000 (UTC)
commit 1f525e263eb9561e22990f3b991f0408d24f8d65
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 30 21:24:03 2015 -0400
builder: Fix compiler warnings
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
gtk/gtkbuilder-menus.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkbuilder-menus.c b/gtk/gtkbuilder-menus.c
index 8a42faa..2259cd0 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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]