summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--gtk/gtkcelllayout.c8
-rw-r--r--gtk/gtkcontainer.c8
-rw-r--r--gtk/gtkdialog.c8
4 files changed, 24 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index d22b812ba3..f8be3d0319 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04 Matthias Clasen <mclasen@redhat.com>
+
+ Bug 545982 – missing braces cause bogus warnings when using GtkBuilder
+
+ * gtk/gtkcelllayout.c:
+ * gtk/gtkdialog.c:
+ * gtk/gtkcontainer.c: Add missing braces to some GtkBuildable
+ implementations. Patch by Antti Kaijanmäki
+
2008-08-05 Tor Lillqvist <tml@novell.com>
* gtk/gtktext.c: Cast pointer to gintptr instead of gulong to
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index c0f54f2676..2783ce8b50 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -330,9 +330,11 @@ attributes_start_element (GMarkupParseContext *context,
guint i;
if (strcmp (element_name, "attribute") == 0)
- for (i = 0; names[i]; i++)
- if (strcmp (names[i], "name") == 0)
- parser_data->attr_name = g_strdup (values[i]);
+ {
+ for (i = 0; names[i]; i++)
+ if (strcmp (names[i], "name") == 0)
+ parser_data->attr_name = g_strdup (values[i]);
+ }
else if (strcmp (element_name, "attributes") == 0)
return;
else
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 4a82b3ea10..ddaee28f14 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -367,9 +367,11 @@ attributes_start_element (GMarkupParseContext *context,
guint i;
if (strcmp (element_name, "property") == 0)
- for (i = 0; names[i]; i++)
- if (strcmp (names[i], "name") == 0)
- parser_data->child_prop_name = g_strdup (values[i]);
+ {
+ for (i = 0; names[i]; i++)
+ if (strcmp (names[i], "name") == 0)
+ parser_data->child_prop_name = g_strdup (values[i]);
+ }
else if (strcmp (element_name, "packing") == 0)
return;
else
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 94aaeb3bd3..7f9df320f4 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1310,9 +1310,11 @@ attributes_start_element (GMarkupParseContext *context,
guint i;
if (strcmp (element_name, "action-widget") == 0)
- for (i = 0; names[i]; i++)
- if (strcmp (names[i], "response") == 0)
- parser_data->response = g_strdup (values[i]);
+ {
+ for (i = 0; names[i]; i++)
+ if (strcmp (names[i], "response") == 0)
+ parser_data->response = g_strdup (values[i]);
+ }
else if (strcmp (element_name, "action-widgets") == 0)
return;
else