From 1fab3d9e20843b649faf3171cefa7d0f36825d6d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 6 Apr 2019 00:48:24 +0000 Subject: [PATCH] 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. --- gtk/tools/gtk-builder-tool-simplify.c | 3 +++ 1 file changed, 3 insertions(+) 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")) {