Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from trunk:

Browse Source 
2007-01-06  Johan Dahlin  <johan@gnome.org>

	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
This commit is contained in:
Johan Dahlin
2008-01-06 02:22:30 +00:00
committed by Johan Dahlin
parent 681d09c445
commit d2f20c569b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2007-01-06 Johan Dahlin <johan@gnome.org>
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 <mitch@imendio.com>
Merged from trunk:

5
gtk/gtk-builder-convert
View File

@@ -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)