summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-04-06 00:48:24 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-04-05 20:52:29 -0400
commit1fab3d9e20843b649faf3171cefa7d0f36825d6d (patch)
tree28dc23256617201e58785543be690ee93a68e11c
parentf950172731c1ea70c753ebf28adac8196537a9a7 (diff)
downloadgtk+-1fab3d9e20843b649faf3171cefa7d0f36825d6d.tar.gz
builder-tool: Handle layout properties gracefully
If there are already layout properties in the ui file, we shouldn't crash, even if --3to4 is given.
-rw-r--r--gtk/tools/gtk-builder-tool-simplify.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index cd15fd504c..7d64b2aa41 100644
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -438,6 +438,9 @@ get_class_name (Element *element)
if (g_str_equal (parent->element_name, "packing"))
parent = parent->parent->parent; /* child - object */
+ else if (g_str_equal (parent->element_name, "layout"))
+ parent = parent->parent->parent->parent; /* object - child - object */
+
if (g_str_equal (parent->element_name, "object"))
{