From c83ba1d9c663db28f3e2ebabed12d466f516c3d2 Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@src.gnome.org>
Date: Sat, 7 Jul 2007 15:50:09 +0000
Subject: [PATCH]     (GtkBuilderConverter._parse): Remove unsupported
 atkrelation and atkproperty     tags

svn path=/trunk/; revision=18392
---
 ChangeLog               |  2 ++
 gtk/gtk-builder-convert | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ea09440c3..8523ccca37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 	to avoid name conflicts.
 	Output newly created objects sorted by id before the old roots under
 	<interface>
+	(GtkBuilderConverter._parse): Remove unsupported atkrelation and atkproperty
+	tags
 
 2007-07-06  Richard Hult  <richard@imendio.com>
 
diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
index e677840807..7666b9f470 100755
--- a/gtk/gtk-builder-convert
+++ b/gtk/gtk-builder-convert
@@ -156,6 +156,7 @@ class GtkBuilderConverter(object):
         glade_iface = self._dom.getElementsByTagName("glade-interface")
         assert glade_iface, ("Badly formed XML, there is "
                              "no <glade-interface> tag.")
+        # Rename glade-interface to interface
         glade_iface[0].tagName = 'interface'
         self._interface = glade_iface[0]
 
@@ -165,17 +166,16 @@ class GtkBuilderConverter(object):
                 if node.name == 'glade-interface':
                     self._dom.removeChild(node)
 
-        # Strip requires
-        requires = self._dom.getElementsByTagName("requires")
-        for require in requires:
-            require.parentNode.childNodes.remove(require)
-
-        for child in self._dom.getElementsByTagName("accessibility"):
-            child.parentNode.removeChild(child)
+        # Strip unsupported tags
+        for tag in ['requires', 'accessibility', 'atkproperty',
+                    'atkrelation']:
+            for child in self._dom.getElementsByTagName(tag):
+                child.parentNode.removeChild(child)
 
         if self.root:
             self._strip_root(self.root)
 
+        # Rename widget to object
         objects = self._dom.getElementsByTagName("widget")
         for node in objects:
             node.tagName = "object"
@@ -184,6 +184,7 @@ class GtkBuilderConverter(object):
             self._convert(node.getAttribute("class"), node)
             self.objects[node.getAttribute('id')] = node
 
+        # Remove empty properties
         for node in self._dom.getElementsByTagName('property'):
             if not node.childNodes:
                 node.parentNode.removeChild(node)