Fixed GtkContainer buildable implementation to set packing properties explicitly...

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 5bf6f4dee833f2c0560d3c19ac5e19aa925d7209..18f046c589fb072e3902b0850a15c5cf3d4e4d77 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -643,30 +643,28 @@ attributes_end_element (GMarkupParseContext *context,
 {
   PackingPropertiesData *parser_data = (PackingPropertiesData*)user_data;
 
-  /* Append the translated strings */
-  if (parser_data->string->len)
+  /* translate the string */
+  if (parser_data->string->len && parser_data->translatable)
     {
-      if (parser_data->translatable)
-       {
-         gchar *translated;
-         const gchar* domain;
-
-         domain = gtk_builder_get_translation_domain (parser_data->builder);
-
-         translated = _gtk_builder_parser_translate (domain,
-                                                     parser_data->context,
-                                                     parser_data->string->str);
-         g_string_set_size (parser_data->string, 0);
-         g_string_append (parser_data->string, translated);
-       }
-
-      gtk_container_buildable_set_child_property (parser_data->container,
-                                                 parser_data->builder,
-                                                 parser_data->child,
-                                                 parser_data->child_prop_name,
+      gchar *translated;
+      const gchar* domain;
+
+      domain = gtk_builder_get_translation_domain (parser_data->builder);
+
+      translated = _gtk_builder_parser_translate (domain,
+                                                 parser_data->context,
                                                  parser_data->string->str);
+      g_string_set_size (parser_data->string, 0);
+      g_string_append (parser_data->string, translated);
     }
 
+  if (parser_data->child_prop_name)
+    gtk_container_buildable_set_child_property (parser_data->container,
+                                               parser_data->builder,
+                                               parser_data->child,
+                                               parser_data->child_prop_name,
+                                               parser_data->string->str);
+
   g_string_set_size (parser_data->string, 0);
   g_free (parser_data->child_prop_name);
   g_free (parser_data->context);