diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index e166f9131b..74520fc2bf 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -135,7 +135,6 @@ content_files = \
x11.sgml \
gtk-query-immodules-3.0.xml \
gtk-update-icon-cache.xml \
- gtk-builder-convert.xml \
visual_index.xml \
getting_started.xml \
overview.xml
@@ -374,8 +373,7 @@ EXTRA_DIST += version.xml.in
man_MANS = \
gtk-query-immodules-3.0.1 \
- gtk-update-icon-cache.1 \
- gtk-builder-convert.1
+ gtk-update-icon-cache.1
if ENABLE_MAN
diff --git a/docs/reference/gtk/gtk-builder-convert.xml b/docs/reference/gtk/gtk-builder-convert.xml
deleted file mode 100644
index 002a73ed5b..0000000000
--- a/docs/reference/gtk/gtk-builder-convert.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-gtk-builder-convert
-1
-
-
-
-gtk-builder-convert
-Glade file conversion utility
-
-
-
-
-gtk-builder-convert
---skip-windows
---target-version version
---root name
-input
-output
-
-
-
-Description
-gtk-builder-convert converts glade files
-into XML files which can be loaded with GtkBuilder.
-
-
-It expects the name of a glade file as the first argument, and writes
-its output the file specified as the second argument.
-
-
-
-Options
-
-
- --skip-windows
- -w
- Convert everything but GtkWindow subclasses.
-
-
- --target-version
- -t
-
-
- Some widgets and properties are different between GTK+ versions 2.0 and
- 3.0, so this option allows to set the desired GTK+ target version.
-
-
-
-
- --root
- -r
- Convert only the widget named name
- and its children.
-
-
-
-
-Bugs
-
-Toolbars are not handled.
-
-
-Support for accessibility is not yet implemented.
-
-
-The script requires a python interpreter to run.
-
-
-
-
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index a3344bb664..9f57e97057 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -358,7 +358,6 @@
GTK+ Tools
-
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 00739174cf..04bbadd51e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1006,8 +1006,6 @@ if BUILD_ICON_CACHE
bin_PROGRAMS += gtk-update-icon-cache
endif
-bin_SCRIPTS = gtk-builder-convert
-
if OS_WIN32
# Workaround for UAC silliness: programs with "update" in their name
@@ -1017,8 +1015,7 @@ if OS_WIN32
GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
-bin_SCRIPTS += \
- $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+bin_SCRIPTS = $(GTK_UPDATE_ICON_CACHE_MANIFEST)
$(GTK_UPDATE_ICON_CACHE_MANIFEST):
(echo '' ; \
@@ -1359,11 +1356,10 @@ EXTRA_DIST += \
line-arrow.xbm \
line-wrap.xbm \
tree_plus.xbm \
- tree_minus.xbm \
+ tree_minus.xbm \
tree_minus.xpm \
tree_plus.xpm \
gtk.def \
- gtk-builder-convert \
gtk-win32.rc \
gtk-win32.rc.in \
gtkwin32embed.h \
diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
deleted file mode 100755
index ed815a5ec3..0000000000
--- a/gtk/gtk-builder-convert
+++ /dev/null
@@ -1,799 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2006-2008 Async Open Source
-# Henrique Romano
-# Johan Dahlin
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# TODO:
-# Toolbars
-
-"""Usage: gtk-builder-convert-3.0 [OPTION] [INPUT] [OUTPUT]
-Converts Glade files into XML files which can be loaded with GtkBuilder.
-The [INPUT] file is
-
- -w, --skip-windows Convert everything but GtkWindow subclasses.
- -r, --root Convert only widget named root and its children
- -h, --help display this help and exit
-
-When OUTPUT is -, write to standard output.
-
-Examples:
- gtk-builder-convert-3.0 preference.glade preferences.ui
-
-Report bugs to http://bugzilla.gnome.org/."""
-
-import getopt
-import os
-import sys
-
-from xml.dom import minidom, Node
-
-DIALOGS = ['GtkDialog',
- 'GtkFileChooserDialog',
- 'GtkMessageDialog']
-WINDOWS = ['GtkWindow'] + DIALOGS
-
-# The subprocess is only available in Python 2.4+
-try:
- import subprocess
- subprocess # pyflakes
-except ImportError:
- subprocess = None
-
-def get_child_nodes(node):
- assert node.tagName == 'object'
- nodes = []
- for child in node.childNodes:
- if child.nodeType != Node.ELEMENT_NODE:
- continue
- if child.tagName != 'child':
- continue
- nodes.append(child)
- return nodes
-
-def get_properties(node):
- assert node.tagName == 'object'
- properties = {}
- for child in node.childNodes:
- if child.nodeType != Node.ELEMENT_NODE:
- continue
- if child.tagName != 'property':
- continue
- value = child.childNodes[0].data
- properties[child.getAttribute('name')] = value
- return properties
-
-def get_property(node, property_name):
- assert node.tagName == 'object'
- properties = get_properties(node)
- return properties.get(property_name)
-
-def get_property_node(node, property_name):
- assert node.tagName == 'object'
- properties = {}
- for child in node.childNodes:
- if child.nodeType != Node.ELEMENT_NODE:
- continue
- if child.tagName != 'property':
- continue
- if child.getAttribute('name') == property_name:
- return child
-
-def get_signal_nodes(node):
- assert node.tagName == 'object'
- signals = []
- for child in node.childNodes:
- if child.nodeType != Node.ELEMENT_NODE:
- continue
- if child.tagName == 'signal':
- signals.append(child)
- return signals
-
-def get_property_nodes(node):
- assert node.tagName == 'object'
- properties = []
- for child in node.childNodes:
- if child.nodeType != Node.ELEMENT_NODE:
- continue
- # FIXME: handle comments
- if child.tagName == 'property':
- properties.append(child)
- return properties
-
-def get_accelerator_nodes(node):
- assert node.tagName == 'object'
- accelerators = []
- for child in node.childNodes:
- if child.nodeType != Node.ELEMENT_NODE:
- continue
- if child.tagName == 'accelerator':
- accelerators.append(child)
- return accelerators
-
-def get_object_node(child_node):
- assert child_node.tagName == 'child', child_node
- nodes = []
- for node in child_node.childNodes:
- if node.nodeType != Node.ELEMENT_NODE:
- continue
- if node.tagName == 'object':
- nodes.append(node)
- assert len(nodes) == 1, nodes
- return nodes[0]
-
-def copy_properties(node, props, prop_dict):
- assert node.tagName == 'object'
- for prop_name in props:
- child = get_property_node(node, prop_name)
- if child is not None:
- prop_dict[prop_name] = child
-
- return node
-
-class GtkBuilderConverter(object):
-
- def __init__(self, skip_windows, target_version, root):
- self.skip_windows = skip_windows
- self.target_version = target_version
- self.root = root
- self.root_objects = []
- self.objects = {}
-
- #
- # Public API
- #
-
- def parse_file(self, file):
- self._dom = minidom.parse(file)
- self._parse()
-
- def parse_buffer(self, buffer):
- self._dom = minidom.parseString(buffer)
- self._parse()
-
- def to_xml(self):
- xml = self._dom.toprettyxml("", "")
- return xml.encode('utf-8')
-
- #
- # Private
- #
-
- def _get_object(self, name):
- return self.objects.get(name)
-
- def _get_objects_by_attr(self, attribute, value):
- return [w for w in self._dom.getElementsByTagName("object")
- if w.getAttribute(attribute) == value]
-
- def _create_object(self, obj_class, obj_id, template=None, properties=None):
- """
- Creates a new