From d2f20c569b7bda7852adb91bffd8ae5ebf0f0164 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Sun, 6 Jan 2008 02:22:30 +0000 Subject: [PATCH] Merged from trunk: 2007-01-06 Johan Dahlin Merged from trunk: * gtk/gtk-builder-convert (GtkBuilderConverter._strip_root): Make sure that --root works for toplevel widgets. (#491847, Phil Lello) svn path=/branches/gtk-2-12/; revision=19310 --- ChangeLog | 8 ++++++++ gtk/gtk-builder-convert | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4511b92e82..99390ed709 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-01-06 Johan Dahlin + + Merged from trunk: + + * gtk/gtk-builder-convert (GtkBuilderConverter._strip_root): + Make sure that --root works for toplevel widgets. + (#491847, Phil Lello) + 2008-01-04 Michael Natterer Merged from trunk: diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert index f2a94098a5..8e5d0892a2 100755 --- a/gtk/gtk-builder-convert +++ b/gtk/gtk-builder-convert @@ -597,16 +597,11 @@ class GtkBuilderConverter(object): raise SystemExit("Could not find an object called `%s'" % ( root_name)) - # If it's already a root object, don't do anything - if widget.parentNode is self._interface: - return - for child in self._interface.childNodes[:]: if child.nodeType != Node.ELEMENT_NODE: continue child.parentNode.removeChild(child) - widget.parentNode.removeChild(widget) self._interface.appendChild(widget)