diff options
| -rw-r--r-- | gtk/tools/gtk-builder-tool-simplify.c | 14 | ||||
| -rw-r--r-- | testsuite/tools/simplify-data-3to4/toolbar.ui | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c index 0541207a97..b61487c537 100644 --- a/gtk/tools/gtk-builder-tool-simplify.c +++ b/gtk/tools/gtk-builder-tool-simplify.c @@ -1726,6 +1726,20 @@ rewrite_toolbar (Element *element, for (l = element->children; l; l = l->next) { Element *child = l->data; + + if (g_str_equal (child->element_name, "property") && + (has_attribute (child, "name", "toolbar_style") || + has_attribute (child, "name", "toolbar-style"))) + { + element->children = g_list_remove (element->children, child); + free_element (child); + break; + } + } + + for (l = element->children; l; l = l->next) + { + Element *child = l->data; Element *object = NULL; Element *packing = NULL; diff --git a/testsuite/tools/simplify-data-3to4/toolbar.ui b/testsuite/tools/simplify-data-3to4/toolbar.ui index 3f45466024..d695a41b6b 100644 --- a/testsuite/tools/simplify-data-3to4/toolbar.ui +++ b/testsuite/tools/simplify-data-3to4/toolbar.ui @@ -3,6 +3,7 @@ <requires lib="gtk+" version="3.0"/> <object class="GtkToolbar"> <property name="visible">1</property> + <property name="toolbar_style">both</property> <child> <object class="GtkToolButton"> <property name="visible">1</property> |