summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-03-23 21:02:39 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-03-23 21:02:39 +0000
commitb539c92312d449f41710e6930aaf086454d667d2 (patch)
treeec9a90bd1421065120f436f7b1453cac894e1fc4
parent272d8a680000e8fbb9556dd7ae5131ed6b1c9ec5 (diff)
parent6a66ccd3e6b8360d4c3ada1456c8423eebdea065 (diff)
downloadgtk+-b539c92312d449f41710e6930aaf086454d667d2.tar.gz
Merge branch 'builder-tool-placeholder-crash' into 'master'
gtk-builder-tool: Avoid a crash with <placeholder/> Closes #3781 See merge request GNOME/gtk!3339
-rw-r--r--tools/gtk-builder-tool-simplify.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/gtk-builder-tool-simplify.c b/tools/gtk-builder-tool-simplify.c
index 990377bd21..22e41a34d7 100644
--- a/tools/gtk-builder-tool-simplify.c
+++ b/tools/gtk-builder-tool-simplify.c
@@ -944,6 +944,8 @@ rewrite_notebook_page (Element *child, Element *tab, MyParserData *data)
object = elt;
else if (g_str_equal (elt->element_name, "packing"))
packing = elt;
+ else if (g_str_equal (elt->element_name, "placeholder"))
+ return child;
}
if (!packing && !tab)