Chain up custom_tag_start() propertly.

Fixes bug #675899 "Infobar not loadable by GTKBuilder (using python gi introspection)"

diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 26a4995831dbd3a65151d8f4c11ee63c88d28174..a3a877da23b9f36321f402626085d7002c65d727 100644 (file)
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -1012,10 +1012,11 @@ gtk_info_bar_buildable_custom_tag_start (GtkBuildable  *buildable,
 {
   ActionWidgetsSubParserData *parser_data;
 
-  if (child)
-    return FALSE;
+  if (parent_buildable_iface->custom_tag_start (buildable, builder, child,
+                                                tagname, parser, data))
+    return TRUE;
 
-  if (strcmp (tagname, "action-widgets") == 0)
+  if (!child && strcmp (tagname, "action-widgets") == 0)
     {
       parser_data = g_slice_new0 (ActionWidgetsSubParserData);
       parser_data->info_bar = GTK_INFO_BAR (buildable);
@@ -1026,8 +1027,7 @@ gtk_info_bar_buildable_custom_tag_start (GtkBuildable  *buildable,
       return TRUE;
     }
 
-  return parent_buildable_iface->custom_tag_start (buildable, builder, child,
-                                                   tagname, parser, data);
+  return FALSE;
 }
 
 static void

diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c
index 80130513e98ecdf0f95f7706cc5d4c0106837e9a..9e5beb0ae8721432532dc696bfe17c40fc38686f 100644 (file)
--- a/gtk/tests/builder.c
+++ b/gtk/tests/builder.c
@@ -2527,6 +2527,9 @@ test_message_area (void)
     "            <property name=\"label\" translatable=\"yes\">Message</property>"
     "          </object>"
     "        </child>"
+    "        <packing>"
+    "          <property name='expand'>False</property>"
+    "        </packing>"
     "      </object>"
     "    </child>"
     "    <child internal-child=\"action_area\">"
@@ -2684,3 +2687,4 @@ main (int argc, char **argv)
 
   return g_test_run();
 }
+