[glade/internal-child-support] * gladeui/glade-widget-adaptor.[ch]: o Added support for reading internal children declaration i



commit 7fca16610e4e1510a481b0a073f7f00967e9221e
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Mon Mar 14 18:17:04 2011 -0300

     * gladeui/glade-widget-adaptor.[ch]:
       o Added support for reading internal children declaration in the catalog
       o Added GWA base class get_internal_child implementation using gtk_buildable_get_internal_child()
       o Create internal children as specified in catalog in glade_widget_adaptor_post_create()
         before calling deep_post_create() and post_create() methods
       o new API glade_widget_adaptor_has_internal_children()
         glade_widget_adaptor_get_internal_children()
    
     * gladeui/glade-widget.[ch]:
       o Made GladeWidget::reason property readable
       o Added new API glade_widget_find_child()
    
     * plugins/gtk+/glade-gtk-action-widgets.[ch]:
       o reworked code from GtkDialog support to read and write widget actions special tags
         found in GtkDialog and GtkInfoBar widgets
    
     * plugins/gtk+/glade-gtk-info-bar.c: support code for reading and writing GtkInfoBar special tags
    
     * plugins/gtk+/glade-gtk.c:
       o Removed GtkBox, GtkDialog, GtkComboBox and GtkTreeView unused get_internal_child functions
       o Removed creation of internal children of GtkDialog, GtkColorSelectionDialog,
         GtkFontSelectionDialog, GtkComboBox and GtkTreeView.
       o Implemented GtkDialog action-widgets tag support using common code.
    
     * plugins/gtk+/gtk+.xml.in:
       o Added support for GtkInfoBar widget.
       o Defined internal children of GtkDialog, GtkColorSelectionDialog,
         GtkFontSelectionDialog, GtkComboBox, GtkInfoBar and GtkTreeView.
    
     * gladeui/glade-xml-utils.h: Added GLADE_TAG_INTERNAL_CHILDREN and GLADE_TAG_ANARCHIST tags
    
     * plugins/glade-catalog.dtd: added new syntax to catalog description

 gladeui/glade-widget-adaptor.c          |  234 ++++-
 gladeui/glade-widget-adaptor.h          |    3 +
 gladeui/glade-widget.c                  |   49 +-
 gladeui/glade-widget.h                  |    2 +
 gladeui/glade-xml-utils.h               |    2 +
 plugins/gtk+/Makefile.am                |    2 +
 plugins/gtk+/glade-gtk-action-widgets.c |  128 ++-
 plugins/gtk+/glade-gtk-action-widgets.h |   46 +
 plugins/gtk+/glade-gtk-info-bar.c       |   53 +
 plugins/gtk+/glade-gtk.c                |  411 +------
 plugins/gtk+/gtk+.xml.in                | 2121 +++++++++++++++----------------
 11 files changed, 1544 insertions(+), 1507 deletions(-)
---
diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c
index b7e9953..419a0f0 100644
--- a/gladeui/glade-widget-adaptor.c
+++ b/gladeui/glade-widget-adaptor.c
@@ -89,6 +89,7 @@ struct _GladeWidgetAdaptorPrivate
   GList       *child_packings;       /* Default packing property values */
   GList       *actions;              /* A list of GWActionClass */
   GList       *packing_actions;      /* A list of GWActionClass for child objects */
+  GList       *internal_children;   /* A list of GladeInternalChild */
   gchar       *catalog;              /* The name of the widget catalog this class
 				      * was declared by.
 				      */
@@ -116,6 +117,12 @@ struct _GladePackingDefault
   gchar *value;
 };
 
+struct _GladeInternalChild
+{
+  gchar *name;
+  gboolean anarchist;
+  GList *children;
+};
 
 enum
 {
@@ -133,6 +140,7 @@ enum
 
 typedef struct _GladeChildPacking GladeChildPacking;
 typedef struct _GladePackingDefault GladePackingDefault;
+typedef struct _GladeInternalChild GladeInternalChild;
 
 static GObjectClass *parent_class = NULL;
 static GHashTable *adaptor_hash = NULL;
@@ -277,6 +285,61 @@ glade_widget_adaptor_get_parent_adaptor (GladeWidgetAdaptor * adaptor)
   return glade_widget_adaptor_get_parent_adaptor_by_type (adaptor->priv->type);
 }
 
+gboolean
+glade_widget_adaptor_has_internal_children (GladeWidgetAdaptor *adaptor)
+{
+  g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), FALSE);
+  return adaptor->priv->internal_children != NULL;
+}
+
+static void
+gwa_get_internal_children (GladeWidgetAdaptor *adaptor,
+                           GObject *container,
+                           GList **children,
+                           GList *list)
+{
+  GList *l;
+  
+  for (l = list; l; l = g_list_next (l))
+    {
+      GladeInternalChild *internal = l->data;
+      GObject *child;
+
+      child = glade_widget_adaptor_get_internal_child (adaptor,
+                                                       container,
+                                                       internal->name);
+
+      if (child)
+        {
+          GtkWidget *parent;
+
+          /* Only return a widget if is not packed into a wrapped object */
+          if (GTK_IS_WIDGET (child) == FALSE ||
+              ((parent = gtk_widget_get_parent (GTK_WIDGET (child))) && 
+              glade_widget_get_from_gobject (parent) == NULL))
+            *children = g_list_prepend (*children, child);
+
+          if (internal->children)
+            gwa_get_internal_children (adaptor, container, children, internal->children);
+        }
+    }
+}
+
+GList *
+glade_widget_adaptor_get_internal_children (GladeWidgetAdaptor *adaptor,
+                                            GObject            *container)
+{
+  GList *children;
+  
+  g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
+
+  children = NULL;
+
+  gwa_get_internal_children (adaptor, container, &children, adaptor->priv->internal_children);
+
+  return children;
+}
+
 static gint
 gwa_signal_comp (gpointer a, gpointer b)
 {
@@ -525,6 +588,36 @@ gwa_inherit_signals (GladeWidgetAdaptor * adaptor)
     }
 }
 
+static GladeInternalChild *
+gwa_internal_children_new (gchar *name, gboolean anarchist)
+{
+  GladeInternalChild *data = g_slice_new0 (GladeInternalChild);
+
+  data->name = g_strdup (name);
+  data->anarchist = anarchist;
+
+  return data;
+}
+
+static GList *
+gwa_internal_children_clone (GList *children)
+{
+  GList *l, *retval = NULL;
+  
+  for (l = children; l; l = g_list_next (l))
+    {
+      GladeInternalChild *data, *child = l->data;
+
+      data = gwa_internal_children_new (child->name, child->anarchist);
+      retval = g_list_prepend (retval, data);
+
+      if (child->children)
+        data->children = gwa_internal_children_clone (child->children);
+    }
+
+  return g_list_reverse (retval);
+}
+
 static GObject *
 glade_widget_adaptor_constructor (GType type,
                                   guint n_construct_properties,
@@ -607,6 +700,10 @@ glade_widget_adaptor_constructor (GType type,
         }
     }
 
+  /* Copy parent internal children */
+  if (parent_adaptor && parent_adaptor->priv->internal_children)
+    adaptor->priv->internal_children = gwa_internal_children_clone (parent_adaptor->priv->internal_children);
+
   return ret_obj;
 }
 
@@ -628,6 +725,32 @@ gwa_child_packing_free (GladeChildPacking * packing)
 }
 
 static void
+gwa_glade_internal_child_free (GladeInternalChild *child)
+{
+  g_free (child->name);
+
+  if (child->children)
+    {
+      g_list_foreach (child->children, (GFunc) gwa_glade_internal_child_free, NULL);
+      g_list_free (child->children);
+    }
+  
+  g_slice_free (GladeInternalChild, child);
+}
+
+static void
+gwa_internal_children_free (GladeWidgetAdaptor *adaptor)
+{
+  if (adaptor->priv->internal_children)
+    {
+      g_list_foreach (adaptor->priv->internal_children,
+                      (GFunc) gwa_glade_internal_child_free, NULL);
+      g_list_free (adaptor->priv->internal_children);
+      adaptor->priv->internal_children = NULL;
+    }
+}
+
+static void
 glade_widget_adaptor_finalize (GObject * object)
 {
   GladeWidgetAdaptor *adaptor = GLADE_WIDGET_ADAPTOR (object);
@@ -686,6 +809,8 @@ glade_widget_adaptor_finalize (GObject * object)
       g_list_free (adaptor->priv->packing_actions);
     }
 
+  gwa_internal_children_free (adaptor);
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -809,6 +934,22 @@ glade_widget_adaptor_object_construct_object (GladeWidgetAdaptor * adaptor,
   return g_object_newv (adaptor->priv->type, n_parameters, parameters);
 }
 
+
+static GObject *
+glade_widget_adaptor_object_get_internal_child (GladeWidgetAdaptor *adaptor,
+                                                GObject *object,
+                                                const gchar *name)
+{
+  static GtkBuilder *builder = NULL;
+  
+  g_return_val_if_fail (GTK_IS_BUILDABLE (object), NULL);
+
+  /* Dummy object just in case the interface use it for something */
+  if (builder == NULL) builder = gtk_builder_new ();
+  
+  return gtk_buildable_get_internal_child (GTK_BUILDABLE (object), builder, name);
+}
+
 static gboolean
 glade_widget_adaptor_object_add_verify (GladeWidgetAdaptor *adaptor,
 					GObject            *parent,
@@ -1216,7 +1357,7 @@ glade_widget_adaptor_class_init (GladeWidgetAdaptorClass * adaptor_class)
       glade_widget_adaptor_object_construct_object;
   adaptor_class->deep_post_create = NULL;
   adaptor_class->post_create = NULL;
-  adaptor_class->get_internal_child = NULL;
+  adaptor_class->get_internal_child = glade_widget_adaptor_object_get_internal_child;
   adaptor_class->verify_property = NULL;
   adaptor_class->set_property = glade_widget_adaptor_object_set_property;
   adaptor_class->get_property = glade_widget_adaptor_object_get_property;
@@ -2181,6 +2322,51 @@ gwa_set_signals_from_node (GladeWidgetAdaptor *adaptor,
     }
 }
 
+static gint
+gwa_internal_child_cmp (gconstpointer a, gconstpointer b)
+{
+  const GladeInternalChild *da = a;
+  return strcmp (da->name, b);
+}
+
+static GList *
+gwa_internal_children_update_from_node (GList *internal_children, GladeXmlNode *node)
+{
+  GList *link, *retval = internal_children;
+  GladeXmlNode *child, *children;
+  
+  for (child = glade_xml_node_get_children (node);
+       child; child = glade_xml_node_next (child))
+    {
+      GladeInternalChild *data;
+      gchar *name;
+
+      if (!glade_xml_node_verify (child, GLADE_XML_TAG_WIDGET))
+        continue;
+
+      if (!(name = glade_xml_get_property_string_required (child, GLADE_TAG_NAME, NULL)))
+        continue;
+
+      if ((link = g_list_find_custom (retval, name, gwa_internal_child_cmp)))
+        {
+          data = link->data;
+        }
+      else
+        {
+          gboolean anarchist = glade_xml_get_boolean (child, GLADE_TAG_ANARCHIST, FALSE);
+          data = gwa_internal_children_new (name, anarchist);
+          retval = g_list_prepend (retval, data);
+        }
+      
+      if ((children = glade_xml_search_child (child, GLADE_TAG_INTERNAL_CHILDREN)))
+        data->children = gwa_internal_children_update_from_node (data->children, children);
+
+      g_free (name);
+    }
+  
+  return retval;
+}
+
 static gboolean
 gwa_extend_with_node (GladeWidgetAdaptor * adaptor,
                       GladeXmlNode * node,
@@ -2218,6 +2404,9 @@ gwa_extend_with_node (GladeWidgetAdaptor * adaptor,
        glade_xml_search_child (node, GLADE_TAG_PACKING_ACTIONS)) != NULL)
     gwa_action_update_from_node (adaptor, TRUE, child, domain, NULL);
 
+  if ((child = glade_xml_search_child (node, GLADE_TAG_INTERNAL_CHILDREN)))
+    adaptor->priv->internal_children = gwa_internal_children_update_from_node (adaptor->priv->internal_children, child);
+
   return TRUE;
 }
 
@@ -3034,6 +3223,41 @@ glade_widget_adaptor_construct_object (GladeWidgetAdaptor * adaptor,
                                                                      parameters);
 }
 
+static void
+gwa_internal_children_create (GladeWidgetAdaptor *adaptor,
+                              GObject *parent_object,
+                              GObject *object,
+                              GList *children,
+                              GladeCreateReason reason)
+{
+  gchar *parent_name = adaptor->priv->generic_name;
+  GladeWidget *gobject = glade_widget_get_from_gobject (object);
+  GList *l;
+
+  for (l = children; l; l = g_list_next (l))
+    {
+      GladeInternalChild *internal = l->data;
+      GObject *child;
+
+      child = glade_widget_adaptor_get_internal_child (adaptor,
+                                                       parent_object,
+                                                       internal->name);
+
+      if (child)
+        {
+          glade_widget_adaptor_create_internal (gobject,
+                                                child,
+                                                internal->name, 
+                                                parent_name,
+                                                internal->anarchist, 
+                                                reason);
+
+          if (internal->children)
+            gwa_internal_children_create (adaptor, parent_object, child, internal->children, reason);
+        }
+    }
+}
+
 /**
  * glade_widget_adaptor_post_create:
  * @adaptor:   A #GladeWidgetAdaptor
@@ -3043,13 +3267,17 @@ glade_widget_adaptor_construct_object (GladeWidgetAdaptor * adaptor,
  * An adaptor function to be called after the object is created
  */
 void
-glade_widget_adaptor_post_create (GladeWidgetAdaptor * adaptor,
-                                  GObject * object, GladeCreateReason reason)
+glade_widget_adaptor_post_create (GladeWidgetAdaptor *adaptor,
+                                  GObject *object, GladeCreateReason reason)
 {
   g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
   g_return_if_fail (G_IS_OBJECT (object));
   g_return_if_fail (g_type_is_a (G_OBJECT_TYPE (object), adaptor->priv->type));
 
+  /* Create internal widgets */
+  if (adaptor->priv->internal_children)
+      gwa_internal_children_create (adaptor, object, object, adaptor->priv->internal_children, reason);
+  
   /* Run post_create in 2 stages, one that chains up and all class adaptors
    * in the hierarchy get a peek, another that is used to setup placeholders
    * and things that differ from the child/parent implementations
diff --git a/gladeui/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h
index 1997258..c609cf9 100644
--- a/gladeui/glade-widget-adaptor.h
+++ b/gladeui/glade-widget-adaptor.h
@@ -843,6 +843,9 @@ GladeSignalClass     *glade_widget_adaptor_get_signal_class   (GladeWidgetAdapto
 							       const gchar        *name);
 GladeWidgetAdaptor   *glade_widget_adaptor_get_parent_adaptor (GladeWidgetAdaptor *adaptor);
 
+gboolean              glade_widget_adaptor_has_internal_children (GladeWidgetAdaptor *adaptor);
+GList                *glade_widget_adaptor_get_internal_children (GladeWidgetAdaptor *adaptor,
+                                                                  GObject            *container);
 G_END_DECLS
 
 #endif /* _GLADE_WIDGET_ADAPTOR_H_ */
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 30bfe1b..14e2edb 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -1140,6 +1140,9 @@ glade_widget_get_real_property (GObject * object,
       case PROP_VISIBLE:
         g_value_set_boolean (value, widget->priv->visible);
         break;
+      case PROP_REASON:
+        g_value_set_int (value, widget->priv->construct_reason);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -1284,7 +1287,7 @@ glade_widget_class_init (GladeWidgetClass * klass)
                          GLADE_CREATE_USER,
                          GLADE_CREATE_REASONS - 1,
                          GLADE_CREATE_USER,
-                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
 
   g_object_class_install_property
       (object_class, PROP_TOPLEVEL_WIDTH,
@@ -1484,10 +1487,7 @@ glade_widget_get_internal_child (GladeWidget * parent, const gchar * internal)
 {
   while (parent)
     {
-      GladeWidgetAdaptorClass *adaptor_class =
-          GLADE_WIDGET_ADAPTOR_GET_CLASS (parent->priv->adaptor);
-
-      if (adaptor_class->get_internal_child)
+      if (glade_widget_adaptor_has_internal_children (parent->priv->adaptor))
         return glade_widget_adaptor_get_internal_child
             (parent->priv->adaptor, parent->priv->object, internal);
 
@@ -3474,6 +3474,45 @@ glade_widget_set_parent (GladeWidget * widget, GladeWidget * parent)
 }
 
 /**
+ * glade_widget_find_child:
+ * @widget: A #GladeWidget
+ * @name: child name
+ *
+ * Finds a child widget named @name.
+ *
+ * Returns: The child of widget or NULL if it was not found.
+ */
+GladeWidget *
+glade_widget_find_child (GladeWidget *widget, gchar *name)
+{
+  GList *adapter_children;
+  GladeWidget *real_child = NULL;
+  GList *node;
+
+  g_return_val_if_fail (GLADE_IS_WIDGET (widget), NULL);
+
+  adapter_children =
+      glade_widget_adaptor_get_children (glade_widget_get_adaptor (widget),
+                                         widget->priv->object);
+
+  for (node = adapter_children; node && !real_child; node = g_list_next (node))
+    {
+      GladeWidget *child = glade_widget_get_from_gobject (node->data);
+
+      if (child)
+        {
+          if (strcmp (child->priv->name, name) == 0)
+            real_child = child;
+          else
+            real_child = glade_widget_find_child (child, name);
+        }
+    }
+  g_list_free (adapter_children);
+
+  return real_child;
+}
+
+/**
  * glade_widget_get_children:
  * @widget: A #GladeWidget
  *
diff --git a/gladeui/glade-widget.h b/gladeui/glade-widget.h
index 091a31d..d3ce6fc 100644
--- a/gladeui/glade-widget.h
+++ b/gladeui/glade-widget.h
@@ -384,6 +384,8 @@ void                    glade_widget_support_changed        (GladeWidget      *w
 
 GtkTreeModel           *glade_widget_get_signal_model       (GladeWidget      *widget);
 
+GladeWidget            *glade_widget_find_child             (GladeWidget *widget,
+                                                             gchar *name);
 
 G_END_DECLS
 
diff --git a/gladeui/glade-xml-utils.h b/gladeui/glade-xml-utils.h
index e08bd1b..c07da74 100644
--- a/gladeui/glade-xml-utils.h
+++ b/gladeui/glade-xml-utils.h
@@ -80,6 +80,8 @@ typedef struct _GladeProject        GladeProject;
 #define GLADE_TAG_BOOK                            "book"
 #define GLADE_TAG_SIGNALS                         "signals"
 #define GLADE_TAG_SIGNAL                          "signal"
+#define GLADE_TAG_INTERNAL_CHILDREN               "internal-children"
+#define GLADE_TAG_ANARCHIST                       "anarchist"
 #define GLADE_TAG_DEFAULT                         "default"
 #define GLADE_TAG_PARENTLESS_WIDGET               "parentless-widget"
 #define GLADE_TAG_DISABLED                        "disabled"
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 957163a..5810eea 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -44,6 +44,8 @@ libgladegtk_la_SOURCES = \
 	glade-string-list.c \
 	glade-gtk-table.c \
 	glade-gtk-grid.c \
+	glade-gtk-action-widgets.c \
+	glade-gtk-info-bar.c \
 	glade-gtk-marshallers.c
 
 libgladegtk_la_LDFLAGS     = -module -avoid-version $(AM_LDFLAGS)
diff --git a/plugins/gtk+/glade-gtk-action-widgets.c b/plugins/gtk+/glade-gtk-action-widgets.c
index c527b3b..c386d0a 100644
--- a/plugins/gtk+/glade-gtk-action-widgets.c
+++ b/plugins/gtk+/glade-gtk-action-widgets.c
@@ -1,15 +1,58 @@
-#define GLADE_TAG_ACTION_WIDGETS "action-widgets"
-#define GLADE_TAG_ACTION_WIDGET  "action-widget"
-#define GLADE_TAG_RESPONSE       "response"
-
+/*
+ * glade-gtk-action-widgets.c
+ *
+ * Copyright (C) 2008 - 2010 Tristan Van Berkom
+ *                      2011 Juan Pablo Ugarte
+ *
+ * Authors:
+ *   Tristan Van Berkom <tvb gnome org>
+ *   Juan Pablo Ugarte <juanpablougarte gmail com>
+ *
+ * This library 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.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "glade-gtk-action-widgets.h"
+
+static GladeWidget *
+glade_gtk_action_widgets_get_area (GladeWidget *widget, gchar *action_area)
+{
+  GladeWidgetAdaptor *adaptor = glade_widget_get_adaptor (widget);
+  GObject *object;
+
+  object = glade_widget_adaptor_get_internal_child (adaptor, 
+                                                    glade_widget_get_object (widget),
+                                                    action_area);
+  
+  return (object) ? glade_widget_get_from_gobject (object) : NULL;
+}
 
 static void
-glade_gtk_dialog_read_responses (GladeWidget * widget,
-                                 GladeXmlNode * widgets_node)
+glade_gtk_action_widgets_read_responses (GladeWidget *widget,
+                                         GladeXmlNode *widgets_node,
+                                         gchar *action_container)
 {
+  GladeWidget *action_widget, *action_area;
   GladeXmlNode *node;
-  GladeWidget *action_widget;
 
+  if ((action_area = glade_gtk_action_widgets_get_area (widget, action_container)) == NULL)
+    {
+      g_warning ("%s: Could not find action widgets container [%s]", __func__, action_container);
+      return;
+    }
+  
   for (node = glade_xml_node_get_children (widgets_node);
        node; node = glade_xml_node_next (node))
     {
@@ -23,13 +66,9 @@ glade_gtk_dialog_read_responses (GladeWidget * widget,
                                                   NULL);
       widget_name = glade_xml_get_content (node);
 
-      if ((action_widget =
-           glade_project_get_widget_by_name (glade_widget_get_project (widget), 
-					     widget_name)) != NULL)
-        {
+      if ((action_widget = glade_widget_find_child (action_area, widget_name)))
           glade_widget_property_set (action_widget, "response-id",
                                      g_ascii_strtoll (response, NULL, 10));
-        }
 
       g_free (response);
       g_free (widget_name);
@@ -37,32 +76,35 @@ glade_gtk_dialog_read_responses (GladeWidget * widget,
 }
 
 void
-glade_gtk_dialog_read_child (GladeWidgetAdaptor * adaptor,
-                             GladeWidget * widget, GladeXmlNode * node)
+glade_gtk_action_widgets_read_child (GladeWidget *widget,
+                                     GladeXmlNode *node,
+                                     gchar *action_container)
 {
   GladeXmlNode *widgets_node;
 
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
-
-  node = glade_xml_node_get_parent (node);
-
   if ((widgets_node =
        glade_xml_search_child (node, GLADE_TAG_ACTION_WIDGETS)) != NULL)
-    glade_gtk_dialog_read_responses (widget, widgets_node);
+    glade_gtk_action_widgets_read_responses (widget, widgets_node, action_container);
 }
 
-
 static void
-glade_gtk_dialog_write_responses (GladeWidget * widget,
-                                  GladeXmlContext * context,
-                                  GladeXmlNode * node)
+glade_gtk_action_widgets_write_responses (GladeWidget *widget,
+                                          GladeXmlContext *context,
+                                          GladeXmlNode *node,
+                                          gchar *action_container)
 {
   GladeXmlNode *widget_node;
-  GtkDialog *dialog = GTK_DIALOG (glade_widget_get_object (widget));
-  GList *l, *action_widgets =
-      gtk_container_get_children (GTK_CONTAINER
-                                  (gtk_dialog_get_action_area (dialog)));
-
+  GList *l, *action_widgets;
+  GladeWidget *action_area;
+
+  if ((action_area = glade_gtk_action_widgets_get_area (widget, action_container)) == NULL)
+   {
+     g_warning ("%s: Could not find action widgets container [%s]", __func__, action_container);
+     return;
+   }
+  
+  action_widgets = glade_widget_get_children (action_area);
+    
   for (l = action_widgets; l; l = l->next)
     {
       GladeWidget *action_widget;
@@ -93,29 +135,19 @@ glade_gtk_dialog_write_responses (GladeWidget * widget,
 }
 
 void
-glade_gtk_dialog_write_child (GladeWidgetAdaptor * adaptor,
-                              GladeWidget * widget,
-                              GladeXmlContext * context, GladeXmlNode * node)
+glade_gtk_action_widgets_write_child (GladeWidget *widget,
+                                      GladeXmlContext *context,
+                                      GladeXmlNode *node,
+                                      gchar *action_container)
 {
   GladeXmlNode *widgets_node;
-  GladeWidget *parent;
-  GladeProject *project;
-
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context,
-                                                   node);
 
-  parent  = glade_widget_get_parent (widget);
-  project = glade_widget_get_project (widget);
+  widgets_node = glade_xml_node_new (context, GLADE_TAG_ACTION_WIDGETS);
 
-  if (parent && GTK_IS_DIALOG (glade_widget_get_object (parent)))
-    {
-      widgets_node = glade_xml_node_new (context, GLADE_TAG_ACTION_WIDGETS);
-
-      glade_gtk_dialog_write_responses (parent, context, widgets_node);
+  glade_gtk_action_widgets_write_responses (widget, context, widgets_node, action_container);
 
-      if (!glade_xml_node_get_children (widgets_node))
-        glade_xml_node_delete (widgets_node);
-      else
-        glade_xml_node_append_child (node, widgets_node);
-    }
+  if (!glade_xml_node_get_children (widgets_node))
+    glade_xml_node_delete (widgets_node);
+  else
+    glade_xml_node_append_child (node, widgets_node);
 }
diff --git a/plugins/gtk+/glade-gtk-action-widgets.h b/plugins/gtk+/glade-gtk-action-widgets.h
new file mode 100644
index 0000000..283786f
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-action-widgets.h
@@ -0,0 +1,46 @@
+/*
+ * glade-gtk-action-widgets.h
+ *
+ * Copyright (C) 2011 Juan Pablo Ugarte.
+ *
+ * Author:
+ *   Juan Pablo Ugarte <juanpablougarte gmail com>
+ *
+ * This library 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.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef __GLADE_GTK_ACTION_WIDGETS_H__
+#define __GLADE_GTK_ACTION_WIDGETS_H__
+
+#include <gladeui/glade.h>
+
+G_BEGIN_DECLS
+
+#define GLADE_TAG_ACTION_WIDGETS "action-widgets"
+#define GLADE_TAG_ACTION_WIDGET  "action-widget"
+#define GLADE_TAG_RESPONSE       "response"
+
+void glade_gtk_action_widgets_read_child  (GladeWidget *widget,
+                                           GladeXmlNode *node,
+                                           gchar *action_container);
+
+void glade_gtk_action_widgets_write_child (GladeWidget *widget,
+                                           GladeXmlContext *context,
+                                           GladeXmlNode *node,
+                                           gchar *action_container);
+G_END_DECLS
+
+#endif /* __GLADE_GTK_ACTION_WIDGETS_H__ */
diff --git a/plugins/gtk+/glade-gtk-info-bar.c b/plugins/gtk+/glade-gtk-info-bar.c
new file mode 100644
index 0000000..ba45dc9
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-info-bar.c
@@ -0,0 +1,53 @@
+/*
+ * glade-gtk-info-bar.c
+ *
+ * Copyright (C) 2011 Juan Pablo Ugarte.
+ *
+ * Author:
+ *   Juan Pablo Ugarte <juanpablougarte gmail com>
+ *
+ * This library 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.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include <config.h>
+#include <gladeui/glade.h>
+#include "glade-gtk-action-widgets.h"
+
+void
+glade_gtk_info_bar_read_child (GladeWidgetAdaptor *adaptor,
+                               GladeWidget *widget,
+                               GladeXmlNode *node)
+{
+  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
+
+  node = glade_xml_node_get_parent (node);
+  
+  glade_gtk_action_widgets_read_child (widget, node, "action_area");
+}
+
+void
+glade_gtk_info_bar_write_child (GladeWidgetAdaptor *adaptor,
+                                GladeWidget *widget,
+                                GladeXmlContext *context,
+                                GladeXmlNode *node)
+{
+  GladeWidget *parent = glade_widget_get_parent (widget);
+
+  GWA_GET_CLASS (GTK_TYPE_BOX)->write_child (adaptor, widget, context, node);
+
+  if (parent && GTK_IS_INFO_BAR (glade_widget_get_object (parent)))
+    glade_gtk_action_widgets_write_child (parent, context, node, "action_area");
+}
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 7216261..0204e51 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -43,6 +43,7 @@
 #include "glade-tool-item-group-editor.h"
 #include "glade-string-list.h"
 #include "glade-fixed.h"
+#include "glade-gtk-action-widgets.h"
 
 #include <gladeui/glade-editor-property.h>
 #include <gladeui/glade-base-editor.h>
@@ -1052,8 +1053,6 @@ glade_gtk_widget_action_submenu (GladeWidgetAdaptor * adaptor,
   return NULL;
 }
 
-
-
 /* ----------------------------- GtkContainer ------------------------------ */
 void
 glade_gtk_container_post_create (GladeWidgetAdaptor * adaptor,
@@ -1234,10 +1233,15 @@ glade_gtk_container_get_child_property (GladeWidgetAdaptor * adaptor,
 }
 
 GList *
-glade_gtk_container_get_children (GladeWidgetAdaptor * adaptor,
-                                  GtkContainer * container)
+glade_gtk_container_get_children (GladeWidgetAdaptor *adaptor,
+                                  GtkContainer *container)
 {
-  return glade_util_container_get_all_children (container);
+  GList *children, *internal_children;
+
+  children = glade_util_container_get_all_children (container);
+  internal_children = glade_widget_adaptor_get_internal_children (adaptor, G_OBJECT (container));
+
+  return g_list_concat (children, internal_children);
 }
 
 GladeEditable *
@@ -1932,36 +1936,6 @@ glade_gtk_box_replace_child (GladeWidgetAdaptor * adaptor,
   g_object_unref (G_OBJECT (current));
 }
 
-
-GObject *
-glade_gtk_box_get_internal_child (GladeWidgetAdaptor * adaptor,
-                                  GObject * object, const gchar * name)
-{
-  GList *children, *l;
-  GObject *child = NULL;
-
-  g_return_val_if_fail (GTK_IS_BOX (object), NULL);
-
-  children = l = gtk_container_get_children (GTK_CONTAINER (object));
-
-  while (l)
-    {
-      GladeWidget *gw = glade_widget_get_from_gobject (l->data);
-
-      if (gw && glade_widget_get_internal (gw) && 
-	  strcmp (glade_widget_get_internal (gw), name) == 0)
-        {
-          child = G_OBJECT (l->data);
-          break;
-        }
-
-      l = l->next;
-    }
-  g_list_free (children);
-
-  return child;
-}
-
 static void
 glade_gtk_box_notebook_child_insert_remove_action (GladeWidgetAdaptor * adaptor,
                                                    GObject * container,
@@ -3900,21 +3874,20 @@ glade_gtk_file_chooser_forall (GtkWidget * widget, gpointer data)
 }
 
 void
-glade_gtk_dialog_post_create (GladeWidgetAdaptor * adaptor,
-                              GObject * object, GladeCreateReason reason)
+glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
+                              GObject *object, GladeCreateReason reason)
 {
-  GtkDialog *dialog = GTK_DIALOG (object);
   GladeWidget *widget;
-  GladeWidget *vbox_widget, *actionarea_widget, *colorsel, *fontsel;
-  GladeWidget *ok_button = NULL, *cancel_button = NULL,
-      *help_button = NULL, *apply_button = NULL;
+  GtkDialog *dialog;
 
-  g_return_if_fail (GTK_IS_DIALOG (dialog));
+  g_return_if_fail (GTK_IS_DIALOG (object));
 
-  widget = glade_widget_get_from_gobject (GTK_WIDGET (dialog));
+  widget = glade_widget_get_from_gobject (GTK_WIDGET (object));
   if (!widget)
     return;
-
+  
+  dialog = GTK_DIALOG (object);
+  
   if (reason == GLADE_CREATE_USER)
     {
       /* HIG complient border-width defaults on dialogs */
@@ -3923,28 +3896,8 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor * adaptor,
 
   if (GTK_IS_COLOR_SELECTION_DIALOG (object))
     {
-      GtkWidget *child;
-
-      child = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_OK);
-      ok_button = glade_widget_adaptor_create_internal
-          (widget, G_OBJECT (child), "ok_button", "colorsel", FALSE, reason);
-
-      child = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_CANCEL);
-      cancel_button = glade_widget_adaptor_create_internal
-          (widget, G_OBJECT (child),
-           "cancel_button", "colorsel", FALSE, reason);
-
-      child = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_HELP);
-      help_button = glade_widget_adaptor_create_internal
-          (widget, G_OBJECT (child), "help_button", "colorsel", FALSE, reason);
-
-      child =
-          gtk_color_selection_dialog_get_color_selection
-          (GTK_COLOR_SELECTION_DIALOG (dialog));
-      colorsel =
-          glade_widget_adaptor_create_internal (widget, G_OBJECT (child),
-                                                "color_selection", "colorsel",
-                                                FALSE, reason);
+      GtkWidget *child = gtk_color_selection_dialog_get_color_selection (GTK_COLOR_SELECTION_DIALOG (dialog));
+      GladeWidget *colorsel = glade_widget_get_from_gobject (child);
 
       /* Set this to 1 at load time, if there are any children then
        * size will adjust appropriately (otherwise the default "3" gets
@@ -3956,37 +3909,8 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor * adaptor,
     }
   else if (GTK_IS_FONT_SELECTION_DIALOG (object))
     {
-      GtkWidget *child;
-
-      child =
-          gtk_font_selection_dialog_get_ok_button (GTK_FONT_SELECTION_DIALOG
-                                                   (dialog));
-      ok_button =
-          glade_widget_adaptor_create_internal (widget, G_OBJECT (child),
-                                                "ok_button", "fontsel", FALSE,
-                                                reason);
-
-      child = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_APPLY);
-      apply_button = glade_widget_adaptor_create_internal
-          (widget, G_OBJECT (child), "apply_button", "fontsel", FALSE, reason);
-
-      child =
-          gtk_font_selection_dialog_get_cancel_button (GTK_FONT_SELECTION_DIALOG
-                                                       (dialog));
-      cancel_button =
-          glade_widget_adaptor_create_internal (widget, G_OBJECT (child),
-                                                "cancel_button", "fontsel",
-                                                FALSE, reason);
-
-#if GTK_CHECK_VERSION (2, 24, 0)
-      child = gtk_font_selection_dialog_get_font_selection
-          (GTK_FONT_SELECTION_DIALOG (dialog));
-#else
-      child = GTK_FONT_SELECTION_DIALOG (dialog)->fontsel;
-#endif
-      fontsel = glade_widget_adaptor_create_internal
-          (widget, G_OBJECT (child),
-           "font_selection", "fontsel", FALSE, reason);
+      GtkWidget *child = gtk_font_selection_dialog_get_cancel_button (GTK_FONT_SELECTION_DIALOG (dialog));
+      GladeWidget *fontsel = glade_widget_get_from_gobject (child);
 
       /* Set this to 1 at load time, if there are any children then
        * size will adjust appropriately (otherwise the default "3" gets
@@ -3997,6 +3921,11 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor * adaptor,
     }
   else
     {
+      GladeWidget *vbox_widget, *actionarea_widget;
+
+      vbox_widget = glade_widget_get_from_gobject (gtk_dialog_get_content_area (dialog));
+      actionarea_widget = glade_widget_get_from_gobject (gtk_dialog_get_action_area (dialog));
+
       /* We need to stop default emissions of "hierarchy-changed" and 
        * "screen-changed" of GtkFileChooserDefault to avoid an abort()
        * when doing a reparent.
@@ -4008,14 +3937,6 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor * adaptor,
                               (gtk_dialog_get_content_area (dialog)),
                               glade_gtk_file_chooser_forall, NULL);
 
-      vbox_widget = glade_widget_adaptor_create_internal
-          (widget, G_OBJECT (gtk_dialog_get_content_area (dialog)),
-           "vbox", "dialog", FALSE, reason);
-
-      actionarea_widget = glade_widget_adaptor_create_internal
-          (vbox_widget, G_OBJECT (gtk_dialog_get_action_area (dialog)),
-           "action_area", "dialog", FALSE, reason);
-
       /* These properties are controlled by the GtkDialog style properties:
        * "content-area-border", "button-spacing" and "action-area-border",
        * so we must disable thier use.
@@ -4047,220 +3968,15 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor * adaptor,
     }
 }
 
-GtkWidget *
-glade_gtk_dialog_get_internal_child (GladeWidgetAdaptor * adaptor,
-                                     GtkDialog * dialog, const gchar * name)
-{
-  GtkWidget *child = NULL;
-
-  g_return_val_if_fail (GTK_IS_DIALOG (dialog), NULL);
-
-  if (GTK_IS_COLOR_SELECTION_DIALOG (dialog))
-    {
-      if (strcmp ("ok_button", name) == 0)
-        child = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_OK);
-      else if (strcmp ("cancel_button", name) == 0)
-        child =
-            gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_CANCEL);
-      else if (strcmp ("help_button", name) == 0)
-        child = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_HELP);
-      else if (strcmp ("color_selection", name) == 0)
-        child = gtk_color_selection_dialog_get_color_selection
-            (GTK_COLOR_SELECTION_DIALOG (dialog));
-    }
-  else if (GTK_IS_FONT_SELECTION_DIALOG (dialog))
-    {
-
-      if (strcmp ("ok_button", name) == 0)
-        child =
-            gtk_font_selection_dialog_get_ok_button (GTK_FONT_SELECTION_DIALOG
-                                                     (dialog));
-      else if (strcmp ("apply_button", name) == 0)
-        child = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_APPLY);
-      else if (strcmp ("cancel_button", name) == 0)
-        child = gtk_font_selection_dialog_get_cancel_button
-            (GTK_FONT_SELECTION_DIALOG (dialog));
-      else if (strcmp ("font_selection", name) == 0)
-        {
-#if GTK_CHECK_VERSION (2, 24, 0)
-          child = gtk_font_selection_dialog_get_font_selection
-              (GTK_FONT_SELECTION_DIALOG (dialog));
-#else
-          child = GTK_FONT_SELECTION_DIALOG (dialog)->fontsel;
-#endif
-        }
-    }
-  else
-    {
-      /* Default generic dialog handling
-       */
-      if (strcmp ("vbox", name) == 0)
-        child = gtk_dialog_get_content_area (dialog);
-      else if (strcmp ("action_area", name) == 0)
-        child = gtk_dialog_get_action_area (dialog);
-    }
-
-  return child;
-}
-
-GList *
-glade_gtk_dialog_get_children (GladeWidgetAdaptor * adaptor, GtkDialog * dialog)
-{
-  GList *list = NULL;
-
-  g_return_val_if_fail (GTK_IS_DIALOG (dialog), NULL);
-
-  list = glade_util_container_get_all_children (GTK_CONTAINER (dialog));
-
-  if (GTK_IS_COLOR_SELECTION_DIALOG (dialog))
-    {
-      GtkWidget *widget;
-
-      widget = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_OK);
-      if (widget)
-        list = g_list_prepend (list, widget);
-
-      widget = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_CANCEL);
-      if (widget)
-        list = g_list_prepend (list, widget);
-
-      widget = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_HELP);
-      if (widget)
-        list = g_list_prepend (list, widget);
-
-      widget =
-          gtk_color_selection_dialog_get_color_selection
-          (GTK_COLOR_SELECTION_DIALOG (dialog));
-      if (widget)
-        list = g_list_prepend (list, widget);
-    }
-  else if (GTK_IS_FONT_SELECTION_DIALOG (dialog))
-    {
-      GtkWidget *widget;
-
-      widget =
-          gtk_font_selection_dialog_get_ok_button (GTK_FONT_SELECTION_DIALOG
-                                                   (dialog));
-      if (widget)
-        list = g_list_prepend (list, widget);
-
-      widget = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_APPLY);
-      if (widget)
-        list = g_list_prepend (list, widget);
-
-      widget =
-          gtk_font_selection_dialog_get_cancel_button (GTK_FONT_SELECTION_DIALOG
-                                                       (dialog));
-      if (widget)
-        list = g_list_prepend (list, widget);
-
-#if GTK_CHECK_VERSION (2, 24, 0)
-      widget =
-          gtk_font_selection_dialog_get_font_selection
-          (GTK_FONT_SELECTION_DIALOG (dialog));
-#else
-      widget = GTK_FONT_SELECTION_DIALOG (dialog)->fontsel;
-#endif
-
-      if (widget)
-        list = g_list_prepend (list, widget);
-    }
-  return list;
-}
-
-
-#define GLADE_TAG_ACTION_WIDGETS "action-widgets"
-#define GLADE_TAG_ACTION_WIDGET  "action-widget"
-#define GLADE_TAG_RESPONSE       "response"
-
-
-static void
-glade_gtk_dialog_read_responses (GladeWidget * widget,
-                                 GladeXmlNode * widgets_node)
-{
-  GladeXmlNode *node;
-  GladeWidget *action_widget;
-
-  for (node = glade_xml_node_get_children (widgets_node);
-       node; node = glade_xml_node_next (node))
-    {
-      gchar *widget_name, *response;
-
-      if (!glade_xml_node_verify (node, GLADE_TAG_ACTION_WIDGET))
-        continue;
-
-      response =
-          glade_xml_get_property_string_required (node, GLADE_TAG_RESPONSE,
-                                                  NULL);
-      widget_name = glade_xml_get_content (node);
-
-      if ((action_widget =
-           glade_project_get_widget_by_name (glade_widget_get_project (widget), 
-					     widget_name)) != NULL)
-        {
-          glade_widget_property_set (action_widget, "response-id",
-                                     g_ascii_strtoll (response, NULL, 10));
-        }
-
-      g_free (response);
-      g_free (widget_name);
-    }
-}
-
 void
 glade_gtk_dialog_read_child (GladeWidgetAdaptor * adaptor,
                              GladeWidget * widget, GladeXmlNode * node)
 {
-  GladeXmlNode *widgets_node;
-
   GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_child (adaptor, widget, node);
 
   node = glade_xml_node_get_parent (node);
 
-  if ((widgets_node =
-       glade_xml_search_child (node, GLADE_TAG_ACTION_WIDGETS)) != NULL)
-    glade_gtk_dialog_read_responses (widget, widgets_node);
-}
-
-
-static void
-glade_gtk_dialog_write_responses (GladeWidget * widget,
-                                  GladeXmlContext * context,
-                                  GladeXmlNode * node)
-{
-  GladeXmlNode *widget_node;
-  GtkDialog *dialog = GTK_DIALOG (glade_widget_get_object (widget));
-  GList *l, *action_widgets =
-      gtk_container_get_children (GTK_CONTAINER
-                                  (gtk_dialog_get_action_area (dialog)));
-
-  for (l = action_widgets; l; l = l->next)
-    {
-      GladeWidget *action_widget;
-      GladeProperty *property;
-      gchar *str;
-
-      if ((action_widget = glade_widget_get_from_gobject (l->data)) == NULL)
-        continue;
-
-      if ((property =
-           glade_widget_get_property (action_widget, "response-id")) == NULL)
-        continue;
-
-      widget_node = glade_xml_node_new (context, GLADE_TAG_ACTION_WIDGET);
-      glade_xml_node_append_child (node, widget_node);
-
-      str =
-          glade_property_class_make_string_from_gvalue (glade_property_get_class (property),
-                                                        glade_property_inline_value (property));
-
-      glade_xml_node_set_property_string (widget_node, GLADE_TAG_RESPONSE, str);
-      glade_xml_set_content (widget_node, glade_widget_get_name (action_widget));
-
-      g_free (str);
-    }
-
-  g_list_free (action_widgets);
+  glade_gtk_action_widgets_read_child (widget, node, "action_area");
 }
 
 void
@@ -4268,27 +3984,12 @@ glade_gtk_dialog_write_child (GladeWidgetAdaptor * adaptor,
                               GladeWidget * widget,
                               GladeXmlContext * context, GladeXmlNode * node)
 {
-  GladeXmlNode *widgets_node;
-  GladeWidget *parent;
-  GladeProject *project;
+  GladeWidget *parent = glade_widget_get_parent (widget);
 
-  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context,
-                                                   node);
-
-  parent  = glade_widget_get_parent (widget);
-  project = glade_widget_get_project (widget);
+  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
 
   if (parent && GTK_IS_DIALOG (glade_widget_get_object (parent)))
-    {
-      widgets_node = glade_xml_node_new (context, GLADE_TAG_ACTION_WIDGETS);
-
-      glade_gtk_dialog_write_responses (parent, context, widgets_node);
-
-      if (!glade_xml_node_get_children (widgets_node))
-        glade_xml_node_delete (widgets_node);
-      else
-        glade_xml_node_append_child (node, widgets_node);
-    }
+    glade_gtk_action_widgets_write_child (parent, context, node, "action_area");
 }
 
 /*--------------------------- GtkMessageDialog ---------------------------------*/
@@ -7919,23 +7620,6 @@ glade_gtk_text_view_set_property (GladeWidgetAdaptor * adaptor,
 
 /* ----------------------------- GtkComboBox ------------------------------ */
 void
-glade_gtk_combo_box_post_create (GladeWidgetAdaptor * adaptor,
-                                 GObject * object, GladeCreateReason reason)
-{
-  GladeWidget *widget = glade_widget_get_from_gobject (object);
-
-  if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (object)))
-    glade_widget_adaptor_create_internal
-        (widget, G_OBJECT (gtk_bin_get_child (GTK_BIN (object))),
-         "entry", "comboboxentry", FALSE, reason);
-
-  /* For some reason combos need a kick in the but in order to show
-   * up properly after loading. */
-  gtk_widget_hide (GTK_WIDGET (object));
-  gtk_widget_show (GTK_WIDGET (object));
-}
-
-void
 glade_gtk_combo_box_set_property (GladeWidgetAdaptor * adaptor,
                                   GObject * object,
                                   const gchar * id, const GValue * value)
@@ -7980,20 +7664,6 @@ glade_gtk_combo_box_get_children (GladeWidgetAdaptor * adaptor,
   return list;
 }
 
-GObject *
-glade_gtk_combo_box_get_internal_child (GladeWidgetAdaptor * adaptor,
-                                        GObject * object, const gchar * name)
-{
-  GObject *child = NULL;
-  g_return_val_if_fail (GTK_IS_COMBO_BOX (object), NULL);
-
-  if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (object)) &&
-      strcmp ("entry", name) == 0)
-    child = G_OBJECT (gtk_bin_get_child (GTK_BIN (object)));
-
-  return child;
-}
-
 /* ----------------------------- GtkComboBoxText ------------------------------ */
 #define GLADE_TAG_ITEMS  "items"
 #define GLADE_TAG_ITEM   "item"
@@ -10654,17 +10324,6 @@ glade_gtk_cell_layout_action_activate_as_widget (GladeWidgetAdaptor * adaptor,
 
 
 /*--------------------------- GtkTreeView ---------------------------------*/
-void
-glade_gtk_treeview_post_create (GladeWidgetAdaptor *adaptor,
-				GObject            *object, 
-				GladeCreateReason   reason)
-{
-  GladeWidget *widget = glade_widget_get_from_gobject (object);
-
-  glade_widget_adaptor_create_internal
-    (widget, G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (object))),
-     "selection", "treeview", FALSE, reason);
-}
 
 gboolean
 glade_gtk_treeview_add_verify (GladeWidgetAdaptor *adaptor,
@@ -10817,16 +10476,6 @@ glade_gtk_treeview_get_children (GladeWidgetAdaptor * adaptor,
   return children;
 }
 
-GObject *
-glade_gtk_treeview_get_internal_child (GladeWidgetAdaptor * adaptor,
-				       GtkTreeView *view, const gchar * name)
-{
-  if (strcmp (name, "selection") == 0)
-    return (GObject *)gtk_tree_view_get_selection (view);
-
-  return NULL;
-}
-
 /* XXX FIXME: We should hide the actual "fixed-height-mode" setting from
  * treeview editors and provide a custom control that sets all its columns
  * to fixed size and then control the column's sensitivity accordingly.
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 6aa444d..9a13297 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1,10 +1,5 @@
-<glade-catalog name="gtk+"
-	       version="3.0"
-	       targetable="2.24,2.22,2.20"
-               icon-prefix="gtk"
-               library="gladegtk"
-               domain="glade3"
-               book="gtk">
+<!DOCTYPE glade-catalog SYSTEM "/home/xjuan/sources/glade/plugins/glade-catalog.dtd">
+<glade-catalog name="gtk+" version="3.0" targetable="2.24,2.22,2.20" icon-prefix="gtk" library="gladegtk" domain="glade3" book="gtk">
   <glade-widget-classes>
 
     <glade-widget-class name="GtkWidget" _title="Widget" default-width="100" default-height="60">
@@ -21,107 +16,107 @@
       <string-from-value-function>glade_gtk_widget_string_from_value</string-from-value-function>
 
       <signals>
-	<signal id="drag-failed" since="2.12"/>
-	<signal id="keynav-failed" since="2.12"/>
-	<signal id="query-tooltip" since="2.12"/>
-	<signal id="damage-event" since="2.14"/>
-	<signal id="state-flags-changed" since="3.0"/>
-	<signal id="style-updated" since="3.0"/>
+	<signal id="drag-failed" since="2.12"></signal>
+	<signal id="keynav-failed" since="2.12"></signal>
+	<signal id="query-tooltip" since="2.12"></signal>
+	<signal id="damage-event" since="2.14"></signal>
+	<signal id="state-flags-changed" since="3.0"></signal>
+	<signal id="style-updated" since="3.0"></signal>
       </signals>
 
       <actions>
-	<action id="preview" _name="Preview snapshot" stock="gtk-execute" important="True"/>
-        <action id="edit_separate" _name="Edit Separately" stock="gtk-edit"/>
-        <action id="remove_parent" _name="Remove Parent" stock="gtk-remove"/>
+	<action id="preview" _name="Preview snapshot" stock="gtk-execute" important="True"></action>
+        <action id="edit_separate" _name="Edit Separately" stock="gtk-edit"></action>
+        <action id="remove_parent" _name="Remove Parent" stock="gtk-remove"></action>
         <action id="add_parent" _name="Add Parent" stock="gtk-add">
-	  <action id="alignment" _name="Alignment"/>
-	  <action id="viewport" _name="Viewport"/>
-	  <action id="eventbox" _name="Event Box"/>
-	  <action id="frame" _name="Frame"/>
-	  <action id="aspect_frame" _name="Aspect Frame"/>
-	  <action id="scrolled_window" _name="Scrolled Window"/>
-	  <action id="expander" _name="Expander"/>
-	  <action id="table" _name="Table"/>
-	  <action id="hbox" _name="Horizontal Box"/>
-	  <action id="vbox" _name="Vertical Box"/>
-	  <action id="hpaned" _name="Horizontal Panes"/>
-	  <action id="vpaned" _name="Vertical Panes"/>
+	  <action id="alignment" _name="Alignment"></action>
+	  <action id="viewport" _name="Viewport"></action>
+	  <action id="eventbox" _name="Event Box"></action>
+	  <action id="frame" _name="Frame"></action>
+	  <action id="aspect_frame" _name="Aspect Frame"></action>
+	  <action id="scrolled_window" _name="Scrolled Window"></action>
+	  <action id="expander" _name="Expander"></action>
+	  <action id="table" _name="Table"></action>
+	  <action id="hbox" _name="Horizontal Box"></action>
+	  <action id="vbox" _name="Vertical Box"></action>
+	  <action id="hpaned" _name="Horizontal Panes"></action>
+	  <action id="vpaned" _name="Vertical Panes"></action>
         </action>
-	<action id="sizegroup_add" _name="Add to Size Group"/>
+	<action id="sizegroup_add" _name="Add to Size Group"></action>
       </actions>
 
       <properties>
-	<property id="tooltip-text" since="2.12" weight="4.2" translatable="True" multiline="True" />
-        <property id="can-focus" common="True" save-always="True"/>
-	<property id="has-default" common="True" ignore="True"/>
-	<property id="can-default" common="True" />
-	<property id="tooltip-markup" since="2.12" weight="4.1" translatable="True" multiline="True"/>
-	<property id="visible" default="True" common="True" ignore="True"/>
-	<property id="width-request"  common="True" optional="True" optional-default="False" default="0"/>
-	<property id="height-request" common="True" optional="True" optional-default="False" default="0"/>
-	<property id="no-show-all" weight="4.6" ignore="True"/>
-	<property id="expand" disabled="True" since="3.0"/>
-	<property id="hexpand" common="True" since="3.0"/>
-	<property id="vexpand" common="True" since="3.0"/>
-	<property id="hexpand-set" disabled="True" since="3.0"/>
-	<property id="vexpand-set" disabled="True" since="3.0"/>
-	<property id="margin" disabled="True" since="3.0"/>
-	<property id="margin-left" common="True" since="3.0"/>
-	<property id="margin-right" common="True" since="3.0"/>
-	<property id="margin-top" common="True" since="3.0"/>
-	<property id="margin-bottom" common="True" since="3.0"/>
+	<property id="tooltip-text" since="2.12" weight="4.2" translatable="True" multiline="True"></property>
+        <property id="can-focus" common="True" save-always="True"></property>
+	<property id="has-default" common="True" ignore="True"></property>
+	<property id="can-default" common="True"></property>
+	<property id="tooltip-markup" since="2.12" weight="4.1" translatable="True" multiline="True"></property>
+	<property id="visible" default="True" common="True" ignore="True"></property>
+	<property id="width-request" common="True" optional="True" optional-default="False" default="0"></property>
+	<property id="height-request" common="True" optional="True" optional-default="False" default="0"></property>
+	<property id="no-show-all" weight="4.6" ignore="True"></property>
+	<property id="expand" disabled="True" since="3.0"></property>
+	<property id="hexpand" common="True" since="3.0"></property>
+	<property id="vexpand" common="True" since="3.0"></property>
+	<property id="hexpand-set" disabled="True" since="3.0"></property>
+	<property id="vexpand-set" disabled="True" since="3.0"></property>
+	<property id="margin" disabled="True" since="3.0"></property>
+	<property id="margin-left" common="True" since="3.0"></property>
+	<property id="margin-right" common="True" since="3.0"></property>
+	<property id="margin-top" common="True" since="3.0"></property>
+	<property id="margin-bottom" common="True" since="3.0"></property>
 
 	<property id="halign" common="True" since="3.0">
   	  <displayable-values>
-	    <value id="GTK_ALIGN_FILL" _name="Fill"/>
-	    <value id="GTK_ALIGN_START" _name="Start"/>
-	    <value id="GTK_ALIGN_CENTER" _name="Center"/>
-	    <value id="GTK_ALIGN_END" _name="End"/>
+	    <value id="GTK_ALIGN_FILL" _name="Fill"></value>
+	    <value id="GTK_ALIGN_START" _name="Start"></value>
+	    <value id="GTK_ALIGN_CENTER" _name="Center"></value>
+	    <value id="GTK_ALIGN_END" _name="End"></value>
 	  </displayable-values>
 	</property>
-	<property id="valign" common="True" since="3.0"/>
+	<property id="valign" common="True" since="3.0"></property>
 
 	<property id="extension-events" common="True">
   	  <displayable-values>
-	    <value id="GDK_EXTENSION_EVENTS_NONE" _name="None"/>
-	    <value id="GDK_EXTENSION_EVENTS_ALL" _name="All"/>
-	    <value id="GDK_EXTENSION_EVENTS_CURSOR" _name="Cursor"/>
+	    <value id="GDK_EXTENSION_EVENTS_NONE" _name="None"></value>
+	    <value id="GDK_EXTENSION_EVENTS_ALL" _name="All"></value>
+	    <value id="GDK_EXTENSION_EVENTS_CURSOR" _name="Cursor"></value>
 	  </displayable-values>
 	</property>
 
 	<property id="events" ignore="True" common="True">
   	  <displayable-values>
-	    <value id="GDK_EXPOSURE_MASK" _name="Exposure"/>
-	    <value id="GDK_POINTER_MOTION_MASK" _name="Pointer Motion"/>
-	    <value id="GDK_POINTER_MOTION_HINT_MASK" _name="Pointer Motion Hint"/>
-	    <value id="GDK_BUTTON_MOTION_MASK" _name="Button Motion"/>
-	    <value id="GDK_BUTTON1_MOTION_MASK" _name="Button 1 Motion"/>
-	    <value id="GDK_BUTTON2_MOTION_MASK" _name="Button 2 Motion"/>
-	    <value id="GDK_BUTTON3_MOTION_MASK" _name="Button 3 Motion"/>
-	    <value id="GDK_BUTTON_PRESS_MASK" _name="Button Press"/>
-	    <value id="GDK_BUTTON_RELEASE_MASK" _name="Button Release"/>
-	    <value id="GDK_KEY_PRESS_MASK" _name="Key Press"/>
-	    <value id="GDK_KEY_RELEASE_MASK" _name="Key Release"/>
-	    <value id="GDK_ENTER_NOTIFY_MASK" _name="Enter Notify"/>
-	    <value id="GDK_LEAVE_NOTIFY_MASK" _name="Leave Notify"/>
-	    <value id="GDK_FOCUS_CHANGE_MASK" _name="Focus Change"/>
-	    <value id="GDK_STRUCTURE_MASK" _name="Structure"/>
-	    <value id="GDK_PROPERTY_CHANGE_MASK" _name="Property Change"/>
-	    <value id="GDK_VISIBILITY_NOTIFY_MASK" _name="Visibility Notify"/>
-	    <value id="GDK_PROXIMITY_IN_MASK" _name="Proximity In"/>
-	    <value id="GDK_PROXIMITY_OUT_MASK" _name="Proximity  Out"/>
-	    <value id="GDK_SUBSTRUCTURE_MASK" _name="Substructure"/>
-	    <value id="GDK_SCROLL_MASK" _name="Scroll"/>
-	    <value id="GDK_ALL_EVENTS_MASK" _name="All Events"/>
+	    <value id="GDK_EXPOSURE_MASK" _name="Exposure"></value>
+	    <value id="GDK_POINTER_MOTION_MASK" _name="Pointer Motion"></value>
+	    <value id="GDK_POINTER_MOTION_HINT_MASK" _name="Pointer Motion Hint"></value>
+	    <value id="GDK_BUTTON_MOTION_MASK" _name="Button Motion"></value>
+	    <value id="GDK_BUTTON1_MOTION_MASK" _name="Button 1 Motion"></value>
+	    <value id="GDK_BUTTON2_MOTION_MASK" _name="Button 2 Motion"></value>
+	    <value id="GDK_BUTTON3_MOTION_MASK" _name="Button 3 Motion"></value>
+	    <value id="GDK_BUTTON_PRESS_MASK" _name="Button Press"></value>
+	    <value id="GDK_BUTTON_RELEASE_MASK" _name="Button Release"></value>
+	    <value id="GDK_KEY_PRESS_MASK" _name="Key Press"></value>
+	    <value id="GDK_KEY_RELEASE_MASK" _name="Key Release"></value>
+	    <value id="GDK_ENTER_NOTIFY_MASK" _name="Enter Notify"></value>
+	    <value id="GDK_LEAVE_NOTIFY_MASK" _name="Leave Notify"></value>
+	    <value id="GDK_FOCUS_CHANGE_MASK" _name="Focus Change"></value>
+	    <value id="GDK_STRUCTURE_MASK" _name="Structure"></value>
+	    <value id="GDK_PROPERTY_CHANGE_MASK" _name="Property Change"></value>
+	    <value id="GDK_VISIBILITY_NOTIFY_MASK" _name="Visibility Notify"></value>
+	    <value id="GDK_PROXIMITY_IN_MASK" _name="Proximity In"></value>
+	    <value id="GDK_PROXIMITY_OUT_MASK" _name="Proximity  Out"></value>
+	    <value id="GDK_SUBSTRUCTURE_MASK" _name="Substructure"></value>
+	    <value id="GDK_SCROLL_MASK" _name="Scroll"></value>
+	    <value id="GDK_ALL_EVENTS_MASK" _name="All Events"></value>
 	  </displayable-values>
 	</property>
 
-	<property id="window" disabled="True" since="2.14"/>
-	<property id="name" disabled="True"/>
-	<property id="parent" disabled="True"/>
-	<property id="style" disabled="True"/>
-	<property id="sensitive" ignore="True"/>
-	<property id="double-buffered" since="2.18"/>
+	<property id="window" disabled="True" since="2.14"></property>
+	<property id="name" disabled="True"></property>
+	<property id="parent" disabled="True"></property>
+	<property id="style" disabled="True"></property>
+	<property id="sensitive" ignore="True"></property>
+	<property id="double-buffered" since="2.18"></property>
 
 	<!-- Accelerators -->
 	<property id="accelerator" _name="Accelerators" ignore="True" common="True" save="False">
@@ -133,16 +128,14 @@
 	</property>
 
 	<!-- Atk name and description properties -->
-	<property id="AtkObject::accessible-name" _name="Accessible Name" ignore="True" atk-property="True" 
-		  translatable="True" save="False" multiline="True">
+	<property id="AtkObject::accessible-name" _name="Accessible Name" ignore="True" atk-property="True" translatable="True" save="False" multiline="True">
 	  <parameter-spec>
 	    <type>GParamString</type>
 	  </parameter-spec>
 	  <_tooltip>Object instance's name formatted for assistive technology access</_tooltip>
 	</property>
 
-	<property id="AtkObject::accessible-description" _name="Accessible Description" ignore="True" 
-		  atk-property="True" translatable="True" save="False" multiline="True">
+	<property id="AtkObject::accessible-description" _name="Accessible Description" ignore="True" atk-property="True" translatable="True" save="False" multiline="True">
 	  <parameter-spec>
 	    <type>GParamString</type>
 	  </parameter-spec>
@@ -290,22 +283,21 @@ embedded in another object</_tooltip>
       <get-children-function>glade_gtk_container_get_children</get-children-function>
 
       <properties>
-        <property id="border-width" common="True" weight="2.5"/>
+        <property id="border-width" common="True" weight="2.5"></property>
         <property id="resize-mode" ignore="True" common="True" weight="4.7">
   	  <displayable-values>
-	    <value id="GTK_RESIZE_PARENT" _name="Parent"/>
-	    <value id="GTK_RESIZE_QUEUE" _name="Queue"/>
-	    <value id="GTK_RESIZE_IMMEDIATE" _name="Immediate"/>
+	    <value id="GTK_RESIZE_PARENT" _name="Parent"></value>
+	    <value id="GTK_RESIZE_QUEUE" _name="Queue"></value>
+	    <value id="GTK_RESIZE_IMMEDIATE" _name="Immediate"></value>
 	  </displayable-values>
 	</property>
-	<property id="child" disabled="True"/>
+	<property id="child" disabled="True"></property>
       </properties>
     </glade-widget-class>
     
     <glade-widget-class name="GtkBox" generic-name="box" _title="Box">
       <create-widget-function>glade_gtk_create_fixed_widget</create-widget-function>
       <post-create-function>glade_gtk_box_post_create</post-create-function>
-      <get-internal-child-function>glade_gtk_box_get_internal_child</get-internal-child-function>
       <get-children-function>glade_gtk_box_get_children</get-children-function>
       <set-property-function>glade_gtk_box_set_property</set-property-function>
       <get-property-function>glade_gtk_box_get_property</get-property-function>
@@ -317,13 +309,13 @@ embedded in another object</_tooltip>
       <child-action-activate-function>glade_gtk_box_child_action_activate</child-action-activate-function>
 
       <packing-actions>
-        <action id="insert_before" _name="Insert Before" stock="gtk-add"/>
-        <action id="insert_after" _name="Insert After" stock="gtk-add"/>
-        <action id="remove_slot" _name="Remove Slot" stock="gtk-remove"/>
+        <action id="insert_before" _name="Insert Before" stock="gtk-add"></action>
+        <action id="insert_after" _name="Insert After" stock="gtk-add"></action>
+        <action id="remove_slot" _name="Remove Slot" stock="gtk-remove"></action>
       </packing-actions>
 
       <properties>
-	<property id="orientation" default="GTK_ORIENTATION_VERTICAL"/>
+	<property id="orientation" default="GTK_ORIENTATION_VERTICAL"></property>
 	<property id="size" _name="Number of items" query="True" default="3" save="False">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -335,14 +327,14 @@ embedded in another object</_tooltip>
 
       <packing-properties>
         <!-- position needs to be always saved in case of using pack end -->
-        <property id="position" weight="0" save-always="True"/>
-        <property id="padding" transfer-on-paste="True" weight="0.5"/>
-        <property id="expand" transfer-on-paste="True" save-always="True"/>
-        <property id="fill" transfer-on-paste="True" save-always="True"/>
+        <property id="position" weight="0" save-always="True"></property>
+        <property id="padding" transfer-on-paste="True" weight="0.5"></property>
+        <property id="expand" transfer-on-paste="True" save-always="True"></property>
+        <property id="fill" transfer-on-paste="True" save-always="True"></property>
         <property id="pack-type" transfer-on-paste="True">
           <displayable-values>
-            <value id="GTK_PACK_START" _name="Start"/>
-            <value id="GTK_PACK_END" _name="End"/>
+            <value id="GTK_PACK_START" _name="Start"></value>
+            <value id="GTK_PACK_END" _name="End"></value>
           </displayable-values>
         </property>
       </packing-properties>
@@ -350,12 +342,12 @@ embedded in another object</_tooltip>
 
     <glade-widget-class name="GtkHBox" generic-name="hbox" _title="Horizontal Box">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
     <glade-widget-class name="GtkVBox" generic-name="vbox" _title="Vertical Box">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
     
@@ -371,110 +363,108 @@ embedded in another object</_tooltip>
 	    <value-type>GtkAccelGroup</value-type>
 	  </parameter-spec>
 	</property>
-	<property id="opacity" since="2.12" ignore="True"/>
-	<property id="startup-id" since="2.12"/>
-	<property id="deletable" since="2.10"/>
-	<property id="transient-for" since="2.10" ignore="True"/>
-	<property id="visible" default="False"/>
-	<property id="icon-name" themed-icon="True" ignore="True"/>
+	<property id="opacity" since="2.12" ignore="True"></property>
+	<property id="startup-id" since="2.12"></property>
+	<property id="deletable" since="2.10"></property>
+	<property id="transient-for" since="2.10" ignore="True"></property>
+	<property id="visible" default="False"></property>
+	<property id="icon-name" themed-icon="True" ignore="True"></property>
      	<property common="True" id="gravity">
   	  <displayable-values>
-	    <value id="GDK_GRAVITY_NORTH_WEST" _name="North West"/>
-	    <value id="GDK_GRAVITY_NORTH" _name="North"/>
-	    <value id="GDK_GRAVITY_NORTH_EAST" _name="North East"/>
-	    <value id="GDK_GRAVITY_WEST" _name="West"/>
-	    <value id="GDK_GRAVITY_CENTER" _name="Center"/>
-	    <value id="GDK_GRAVITY_EAST" _name="East"/>
-	    <value id="GDK_GRAVITY_SOUTH_WEST" _name="South West"/>
-	    <value id="GDK_GRAVITY_SOUTH" _name="South"/>
-	    <value id="GDK_GRAVITY_SOUTH_EAST" _name="South East"/>
-	    <value id="GDK_GRAVITY_STATIC" _name="Static"/>
+	    <value id="GDK_GRAVITY_NORTH_WEST" _name="North West"></value>
+	    <value id="GDK_GRAVITY_NORTH" _name="North"></value>
+	    <value id="GDK_GRAVITY_NORTH_EAST" _name="North East"></value>
+	    <value id="GDK_GRAVITY_WEST" _name="West"></value>
+	    <value id="GDK_GRAVITY_CENTER" _name="Center"></value>
+	    <value id="GDK_GRAVITY_EAST" _name="East"></value>
+	    <value id="GDK_GRAVITY_SOUTH_WEST" _name="South West"></value>
+	    <value id="GDK_GRAVITY_SOUTH" _name="South"></value>
+	    <value id="GDK_GRAVITY_SOUTH_EAST" _name="South East"></value>
+	    <value id="GDK_GRAVITY_STATIC" _name="Static"></value>
 	  </displayable-values>
 	</property>
-	<property id="modal" ignore="True"/>
-	<property id="default-width" default="440" optional="True" optional-default="False"/>
-	<property id="default-height" default="250" optional="True" optional-default="False"/>
+	<property id="modal" ignore="True"></property>
+	<property id="default-width" default="440" optional="True" optional-default="False"></property>
+	<property id="default-height" default="250" optional="True" optional-default="False"></property>
 	<property id="type-hint" ignore="True">
   	  <displayable-values>
-	    <value id="GDK_WINDOW_TYPE_HINT_NORMAL" _name="Normal"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_DIALOG" _name="Dialog"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_MENU" _name="Menu"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_TOOLBAR" _name="Toolbar"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_SPLASHSCREEN" _name="Splash Screen"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_UTILITY" _name="Utility"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_DOCK" _name="Dock"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_DESKTOP" _name="Desktop"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU" _name="Drop Down Menu"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_POPUP_MENU" _name="Popup Menu"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_TOOLTIP" _name="Tooltip"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_NOTIFICATION" _name="Notification"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_COMBO" _name="Combo"/>
-	    <value id="GDK_WINDOW_TYPE_HINT_DND" _name="Drag and Drop"/>
+	    <value id="GDK_WINDOW_TYPE_HINT_NORMAL" _name="Normal"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_DIALOG" _name="Dialog"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_MENU" _name="Menu"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_TOOLBAR" _name="Toolbar"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_SPLASHSCREEN" _name="Splash Screen"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_UTILITY" _name="Utility"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_DOCK" _name="Dock"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_DESKTOP" _name="Desktop"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU" _name="Drop Down Menu"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_POPUP_MENU" _name="Popup Menu"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_TOOLTIP" _name="Tooltip"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_NOTIFICATION" _name="Notification"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_COMBO" _name="Combo"></value>
+	    <value id="GDK_WINDOW_TYPE_HINT_DND" _name="Drag and Drop"></value>
 	  </displayable-values>
 	</property>
 	<property id="type" ignore="True">
 	  <displayable-values>
-	    <value id="GTK_WINDOW_TOPLEVEL" _name="Top Level"/>
-	    <value id="GTK_WINDOW_POPUP" _name="Popup"/>
-	    <value id="GTK_WINDOW_OFFSCREEN" _name="Offscreen"/>
+	    <value id="GTK_WINDOW_TOPLEVEL" _name="Top Level"></value>
+	    <value id="GTK_WINDOW_POPUP" _name="Popup"></value>
+	    <value id="GTK_WINDOW_OFFSCREEN" _name="Offscreen"></value>
 	  </displayable-values>
 	</property>
-	<property id="allow-shrink" disabled="True" />
-	<property id="allow-grow" disabled="True" />
-	<property id="resize-mode" disabled="True" />
-	<property id="screen" disabled="True" />
-	<property id="resizable" ignore="True" />
-	<property id="decorated" ignore="True" />
-	<property id="title" ignore="True" translatable="True"/>
+	<property id="allow-shrink" disabled="True"></property>
+	<property id="allow-grow" disabled="True"></property>
+	<property id="resize-mode" disabled="True"></property>
+	<property id="screen" disabled="True"></property>
+	<property id="resizable" ignore="True"></property>
+	<property id="decorated" ignore="True"></property>
+	<property id="title" ignore="True" translatable="True"></property>
       	<property id="window-position" ignore="True">
   	  <displayable-values>
-	    <value id="GTK_WIN_POS_NONE" _name="None"/>
-	    <value id="GTK_WIN_POS_CENTER" _name="Center"/>
-	    <value id="GTK_WIN_POS_MOUSE" _name="Mouse"/>
-	    <value id="GTK_WIN_POS_CENTER_ALWAYS" _name="Always Center"/>
-	    <value id="GTK_WIN_POS_CENTER_ON_PARENT" _name="Center on Parent"/>
+	    <value id="GTK_WIN_POS_NONE" _name="None"></value>
+	    <value id="GTK_WIN_POS_CENTER" _name="Center"></value>
+	    <value id="GTK_WIN_POS_MOUSE" _name="Mouse"></value>
+	    <value id="GTK_WIN_POS_CENTER_ALWAYS" _name="Always Center"></value>
+	    <value id="GTK_WIN_POS_CENTER_ON_PARENT" _name="Center on Parent"></value>
           </displayable-values>
 	</property>
-	<property id="accept-focus" ignore="True"/>
-	<property id="application" since="3.0" disabled="True"/>
-	<property id="has-resize-grip" since="3.0"/>
-	<property id="resize-grip-visible" since="3.0" disabled="True"/>
+	<property id="accept-focus" ignore="True"></property>
+	<property id="application" since="3.0" disabled="True"></property>
+	<property id="has-resize-grip" since="3.0"></property>
+	<property id="resize-grip-visible" since="3.0" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkOffscreenWindow" generic-name="offscreenwindow" _title="Offscreen Window" 
-			parent="GtkWindow" toplevel="True" default-width="440" default-height="250" 
-			since="2.20">
+    <glade-widget-class name="GtkOffscreenWindow" generic-name="offscreenwindow" _title="Offscreen Window" parent="GtkWindow" toplevel="True" default-width="440" default-height="250" since="2.20">
       <properties> 
 	<!-- Disable a handfull of properties that dont make sense for GtkOffScreenWindow
 	     (all window properties actually)
 	  -->
-	<property id="accel-groups" disabled="True"/>
-	<property id="opacity" disabled="True"/>
-	<property id="startup-id" disabled="True"/>
-	<property id="transient-for" disabled="True"/>
-	<property id="icon" disabled="True"/>
-	<property id="icon-name" disabled="True"/>
-     	<property id="gravity" disabled="True"/>
-	<property id="modal" disabled="True"/>
-	<property id="default-width" disabled="True"/>
-	<property id="default-height" disabled="True"/>
-	<property id="type-hint" disabled="True"/>
-	<property id="type" disabled="True"/>
-	<property id="resizable" disabled="True" />
-	<property id="decorated" disabled="True" />
-	<property id="deletable" disabled="True"/>
-	<property id="title" disabled="True"/>
-      	<property id="window-position" disabled="True"/>
-      	<property id="skip-taskbar-hint" disabled="True"/>
-      	<property id="skip-pager-hint" disabled="True"/>
-      	<property id="urgency-hint" disabled="True"/>
-      	<property id="has-resize-grip" disabled="True"/>
-      	<property id="role" disabled="True"/>
-      	<property id="accept-focus" disabled="True"/>
-      	<property id="focus-on-map" disabled="True"/>
-      	<property id="mnemonics-visible" disabled="True"/>
-      	<property id="destroy-with-parent" disabled="True"/>
+	<property id="accel-groups" disabled="True"></property>
+	<property id="opacity" disabled="True"></property>
+	<property id="startup-id" disabled="True"></property>
+	<property id="transient-for" disabled="True"></property>
+	<property id="icon" disabled="True"></property>
+	<property id="icon-name" disabled="True"></property>
+     	<property id="gravity" disabled="True"></property>
+	<property id="modal" disabled="True"></property>
+	<property id="default-width" disabled="True"></property>
+	<property id="default-height" disabled="True"></property>
+	<property id="type-hint" disabled="True"></property>
+	<property id="type" disabled="True"></property>
+	<property id="resizable" disabled="True"></property>
+	<property id="decorated" disabled="True"></property>
+	<property id="deletable" disabled="True"></property>
+	<property id="title" disabled="True"></property>
+      	<property id="window-position" disabled="True"></property>
+      	<property id="skip-taskbar-hint" disabled="True"></property>
+      	<property id="skip-pager-hint" disabled="True"></property>
+      	<property id="urgency-hint" disabled="True"></property>
+      	<property id="has-resize-grip" disabled="True"></property>
+      	<property id="role" disabled="True"></property>
+      	<property id="accept-focus" disabled="True"></property>
+      	<property id="focus-on-map" disabled="True"></property>
+      	<property id="mnemonics-visible" disabled="True"></property>
+      	<property id="destroy-with-parent" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
@@ -489,7 +479,7 @@ embedded in another object</_tooltip>
       <action-activate-function>glade_gtk_menu_shell_action_activate</action-activate-function>
 
       <signals>
-	<signal id="move-selected" since="2.10"/>
+	<signal id="move-selected" since="2.10"></signal>
       </signals>
 
       <packing-properties>
@@ -503,8 +493,7 @@ embedded in another object</_tooltip>
       </packing-properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkMenuItem" generic-name="menuitem" _title="Menu Item" use-placeholders="False"
-			 since="2.16">
+    <glade-widget-class name="GtkMenuItem" generic-name="menuitem" _title="Menu Item" use-placeholders="False" since="2.16">
       <constructor-function>glade_gtk_menu_item_constructor</constructor-function>
       <post-create-function>glade_gtk_menu_item_post_create</post-create-function>
       <get-children-function>glade_gtk_menu_item_get_children</get-children-function>
@@ -517,29 +506,27 @@ embedded in another object</_tooltip>
       <special-child-type>submenu</special-child-type>
 
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
       <properties>
-        <property id="accel-path" since="2.14"/>
-        <property id="right-justified" since="2.14"/>
-        <property id="width-chars" since="2.14"/>
-        <property id="label" _name="Label" translatable="True" since="2.16"/>
-        <property id="use-underline" _name="Use Underline" since="2.16"/>
+        <property id="accel-path" since="2.14"></property>
+        <property id="right-justified" since="2.14"></property>
+        <property id="width-chars" since="2.14"></property>
+        <property id="label" _name="Label" translatable="True" since="2.16"></property>
+        <property id="use-underline" _name="Use Underline" since="2.16"></property>
 
 	<!-- GtkActivatable -->
-      	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16"/>
-      	<property id="use-action-appearance" _name="Use Action Appearance" 
-		  custom-layout="True" needs-sync="True" default="False" since="2.16"/>
+      	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16"></property>
+      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" needs-sync="True" default="False" since="2.16"></property>
 
 	<!-- Atk click property -->
-	<property id="atk-click" _name="Click" ignore="True" atk-property="True" save="False" 
-		  multiline="True">
+	<property id="atk-click" _name="Click" ignore="True" atk-property="True" save="False" multiline="True">
 	  <parameter-spec>
 	    <type>GParamString</type>
 	  </parameter-spec>
 	  <_tooltip>Set the description of the Click atk action</_tooltip>
 	</property>
-        <property id="submenu" since="2.12" disabled="True"/>
+        <property id="submenu" since="2.12" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
@@ -549,7 +536,7 @@ embedded in another object</_tooltip>
       <set-property-function>glade_gtk_image_menu_item_set_property</set-property-function>
       <create-editable-function>glade_gtk_image_menu_item_create_editable</create-editable-function>
       <properties>
-        <property id="use-stock" default="True" visible="False" save-always="True" since="2.16"/>
+        <property id="use-stock" default="True" visible="False" save-always="True" since="2.16"></property>
 	<property id="stock" stock="True" _name="Stock Item" save="False" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamString</type>
@@ -557,27 +544,27 @@ embedded in another object</_tooltip>
 	  <_tooltip>The stock item for this menu item</_tooltip>
 	</property>
 	<!-- We save the label manually with the stock value if use_stock is set. -->
-        <property id="label" save="False" custom-layout="True"/>
-        <property id="use-underline" custom-layout="True"/>
-	<property id="image" parentless-widget="True" visible="False"/>
-	<property id="accel-group" _name="Accel Group" custom-layout="True" since="2.16" />
+        <property id="label" save="False" custom-layout="True"></property>
+        <property id="use-underline" custom-layout="True"></property>
+	<property id="image" parentless-widget="True" visible="False"></property>
+	<property id="accel-group" _name="Accel Group" custom-layout="True" since="2.16"></property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkCheckMenuItem" generic-name="checkmenuitem" _title="Check Menu Item"/>
+    <glade-widget-class name="GtkCheckMenuItem" generic-name="checkmenuitem" _title="Check Menu Item"></glade-widget-class>
 
     <glade-widget-class name="GtkRadioMenuItem" generic-name="radiomenuitem" _title="Radio Menu Item">
       <set-property-function>glade_gtk_radio_menu_item_set_property</set-property-function>
       <properties>
-        <property id="draw-as-radio" default="True"/>
-	<property id="inconsistent" visible="False" save="False" default="False"/>
+        <property id="draw-as-radio" default="True"></property>
+	<property id="inconsistent" visible="False" save="False" default="False"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkSeparatorMenuItem" generic-name="separatormenuitem" _title="Separator Menu Item">
       <properties>
-        <property id="label" disabled="True"/>
-        <property id="use-underline" disabled="True"/>
+        <property id="label" disabled="True"></property>
+        <property id="use-underline" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
@@ -585,21 +572,21 @@ embedded in another object</_tooltip>
       <post-create-function>glade_gtk_menu_bar_post_create</post-create-function>
       <!-- menubar is a container you can't add placeholders to it -->
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
       <properties>
         <property id="child-pack-direction">
           <displayable-values>
-	    <value id="GTK_PACK_DIRECTION_LTR" _name="Left to Right"/>
-	    <value id="GTK_PACK_DIRECTION_RTL" _name="Right to Left"/>
-	    <value id="GTK_PACK_DIRECTION_TTB" _name="Top to Bottom"/>
-	    <value id="GTK_PACK_DIRECTION_BTT" _name="Bottom to Top"/>
+	    <value id="GTK_PACK_DIRECTION_LTR" _name="Left to Right"></value>
+	    <value id="GTK_PACK_DIRECTION_RTL" _name="Right to Left"></value>
+	    <value id="GTK_PACK_DIRECTION_TTB" _name="Top to Bottom"></value>
+	    <value id="GTK_PACK_DIRECTION_BTT" _name="Bottom to Top"></value>
 	  </displayable-values>
 	</property>
       </properties>
       <packing-defaults>
 	<parent-class name="GtkVBox">
-	  <child-property id="expand" default="false"/>
+	  <child-property id="expand" default="false"></child-property>
 	</parent-class>
       </packing-defaults>
     </glade-widget-class>
@@ -614,25 +601,25 @@ embedded in another object</_tooltip>
       <action-activate-function>glade_gtk_toolbar_action_activate</action-activate-function>
 
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
       <properties>
-      	<property id="icon-size-set" since="2.10" disabled="True"/>
+      	<property id="icon-size-set" since="2.10" disabled="True"></property>
 	<property id="orientation">
   	  <displayable-values>
-	    <value id="GTK_ORIENTATION_HORIZONTAL" _name="Horizontal"/>
-	    <value id="GTK_ORIENTATION_VERTICAL" _name="Vertical"/>
+	    <value id="GTK_ORIENTATION_HORIZONTAL" _name="Horizontal"></value>
+	    <value id="GTK_ORIENTATION_VERTICAL" _name="Vertical"></value>
 	  </displayable-values>
 	</property>
       	<property id="toolbar-style" save-always="True" optional="True" optional-default="False" weight="0.4">
   	  <displayable-values>
-	    <value id="GTK_TOOLBAR_ICONS" _name="Icons only"/>
-	    <value id="GTK_TOOLBAR_TEXT" _name="Text only"/>
-	    <value id="GTK_TOOLBAR_BOTH" _name="Text below icons"/>
-	    <value id="GTK_TOOLBAR_BOTH_HORIZ" _name="Text beside icons"/>
+	    <value id="GTK_TOOLBAR_ICONS" _name="Icons only"></value>
+	    <value id="GTK_TOOLBAR_TEXT" _name="Text only"></value>
+	    <value id="GTK_TOOLBAR_BOTH" _name="Text below icons"></value>
+	    <value id="GTK_TOOLBAR_BOTH_HORIZ" _name="Text beside icons"></value>
 	  </displayable-values>
 	</property>
-      	<property id="icon-size" since="2.10" optional="True" optional-default="False" weight="0.5"/>
+      	<property id="icon-size" since="2.10" optional="True" optional-default="False" weight="0.5"></property>
       </properties>
 
       <packing-properties>
@@ -643,19 +630,18 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
           <_tooltip>The position of the tool item in the toolbar</_tooltip>
         </property>
-	<property id="expand" transfer-on-paste="True" save-always="True"/>
-        <property id="homogeneous" transfer-on-paste="True"/>
+	<property id="expand" transfer-on-paste="True" save-always="True"></property>
+        <property id="homogeneous" transfer-on-paste="True"></property>
       </packing-properties>
 
       <packing-defaults>
 	<parent-class name="GtkVBox">
-	  <child-property id="expand" default="false"/>
+	  <child-property id="expand" default="false"></child-property>
 	</parent-class>
       </packing-defaults>
     </glade-widget-class>
     
-    <glade-widget-class name="GtkToolPalette" generic-name="toolpalette" _title="Tool Palette" 
-			use-placeholders="False" since="2.20">
+    <glade-widget-class name="GtkToolPalette" generic-name="toolpalette" _title="Tool Palette" use-placeholders="False" since="2.20">
       <post-create-function>glade_gtk_toolbar_post_create</post-create-function>
       <add-child-verify-function>glade_gtk_tool_palette_add_verify</add-child-verify-function>
       <add-child-function>glade_gtk_tool_palette_add_child</add-child-function>
@@ -665,20 +651,20 @@ embedded in another object</_tooltip>
       <action-activate-function>glade_gtk_tool_palette_action_activate</action-activate-function>
 
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
       <properties>
-      	<property id="icon-size-set" disabled="True"/>
-      	<property id="toolbar-style" save-always="True" optional="True" optional-default="False" weight="0.4"/>
+      	<property id="icon-size-set" disabled="True"></property>
+      	<property id="toolbar-style" save-always="True" optional="True" optional-default="False" weight="0.4"></property>
       	<property id="icon-size" optional="True" optional-default="False" weight="0.5">
   	  <displayable-values>
-	    <value id="GTK_ICON_SIZE_INVALID" _name="Invalid"/>
-	    <value id="GTK_ICON_SIZE_MENU" _name="Menu"/>
-	    <value id="GTK_ICON_SIZE_SMALL_TOOLBAR" _name="Small Toolbar"/>
-	    <value id="GTK_ICON_SIZE_LARGE_TOOLBAR" _name="Large Toolbar"/>
-	    <value id="GTK_ICON_SIZE_BUTTON" _name="Button"/>
-	    <value id="GTK_ICON_SIZE_DND" _name="Drag &amp; Drop"/>
-	    <value id="GTK_ICON_SIZE_DIALOG" _name="Dialog"/>
+	    <value id="GTK_ICON_SIZE_INVALID" _name="Invalid"></value>
+	    <value id="GTK_ICON_SIZE_MENU" _name="Menu"></value>
+	    <value id="GTK_ICON_SIZE_SMALL_TOOLBAR" _name="Small Toolbar"></value>
+	    <value id="GTK_ICON_SIZE_LARGE_TOOLBAR" _name="Large Toolbar"></value>
+	    <value id="GTK_ICON_SIZE_BUTTON" _name="Button"></value>
+	    <value id="GTK_ICON_SIZE_DND" _name="Drag &amp; Drop"></value>
+	    <value id="GTK_ICON_SIZE_DIALOG" _name="Dialog"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -691,13 +677,12 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
           <_tooltip>The position of the tool item group in the palette</_tooltip>
         </property>
-	<property id="expand" transfer-on-paste="True" save-always="True"/>
-        <property id="exclusive" transfer-on-paste="True"/>
+	<property id="expand" transfer-on-paste="True" save-always="True"></property>
+        <property id="exclusive" transfer-on-paste="True"></property>
       </packing-properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkToolItemGroup" generic-name="toolitemgroup" _title="Tool Item Group" 
-			use-placeholders="False" since="2.20">
+    <glade-widget-class name="GtkToolItemGroup" generic-name="toolitemgroup" _title="Tool Item Group" use-placeholders="False" since="2.20">
       <post-create-function>empty</post-create-function>
       <set-property-function>glade_gtk_tool_item_group_set_property</set-property-function>
       <add-child-verify-function>glade_gtk_tool_item_group_add_verify</add-child-verify-function>
@@ -707,8 +692,8 @@ embedded in another object</_tooltip>
       <read-widget-function>glade_gtk_tool_item_group_read_widget</read-widget-function>
 
       <properties>
-        <property id="label" translatable="True" multiline="True" default="toolitemgroup" custom-layout="True"/>
-	<property id="label-widget" parentless-widget="True" create-type="GtkLabel" custom-layout="True"/>
+        <property id="label" translatable="True" multiline="True" default="toolitemgroup" custom-layout="True"></property>
+	<property id="label-widget" parentless-widget="True" create-type="GtkLabel" custom-layout="True"></property>
 
 	<!-- Virtual label type property -->
         <property id="custom-label" default="False" visible="False" save="False">
@@ -718,26 +703,26 @@ embedded in another object</_tooltip>
         </property>
       	<property id="ellipsize">
   	  <displayable-values>
-	    <value id="PANGO_ELLIPSIZE_NONE" _name="None"/>
-	    <value id="PANGO_ELLIPSIZE_START" _name="Start"/>
-	    <value id="PANGO_ELLIPSIZE_MIDDLE" _name="Middle"/>
-	    <value id="PANGO_ELLIPSIZE_END" _name="End"/>
+	    <value id="PANGO_ELLIPSIZE_NONE" _name="None"></value>
+	    <value id="PANGO_ELLIPSIZE_START" _name="Start"></value>
+	    <value id="PANGO_ELLIPSIZE_MIDDLE" _name="Middle"></value>
+	    <value id="PANGO_ELLIPSIZE_END" _name="End"></value>
 	  </displayable-values>
 	</property>
       	<property id="header-relief">
   	  <displayable-values>
-	    <value id="GTK_RELIEF_NORMAL" _name="Normal"/>
-	    <value id="GTK_RELIEF_HALF" _name="Half"/>
-	    <value id="GTK_RELIEF_NONE" _name="None"/>
+	    <value id="GTK_RELIEF_NORMAL" _name="Normal"></value>
+	    <value id="GTK_RELIEF_HALF" _name="Half"></value>
+	    <value id="GTK_RELIEF_NONE" _name="None"></value>
 	  </displayable-values>
 	</property>
       </properties>
 
       <packing-properties>
-	<property id="expand" transfer-on-paste="True"/>
-        <property id="fill" transfer-on-paste="True"/>
-        <property id="row-new" transfer-on-paste="True"/>
-        <property id="homogeneous" transfer-on-paste="True"/>
+	<property id="expand" transfer-on-paste="True"></property>
+        <property id="fill" transfer-on-paste="True"></property>
+        <property id="row-new" transfer-on-paste="True"></property>
+        <property id="homogeneous" transfer-on-paste="True"></property>
       </packing-properties>
     </glade-widget-class>
 
@@ -749,15 +734,13 @@ embedded in another object</_tooltip>
 
       <properties>
 	<!-- GtkActivatable -->
-      	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16"/>
-      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" 
-		  default="False" since="2.16"/>
+      	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16"></property>
+      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" default="False" since="2.16"></property>
       </properties>
 
     </glade-widget-class>
 
-    <glade-widget-class name="GtkSeparatorToolItem" generic-name="separatortoolitem" 
-			_title="Separator Tool Item"/>
+    <glade-widget-class name="GtkSeparatorToolItem" generic-name="separatortoolitem" _title="Separator Tool Item"></glade-widget-class>
 
     <glade-widget-class name="GtkToolButton" generic-name="toolbutton" _title="Tool Button">
       <create-editable-function>glade_gtk_tool_button_create_editable</create-editable-function>
@@ -781,19 +764,18 @@ embedded in another object</_tooltip>
 	<property id="stock-id" visible="False" stock-icon="True" custom-layout="True">
           <_tooltip>The stock icon displayed on the item (choose an item from GTK+ stock or from an icon factory)</_tooltip>
 	</property>
-        <property id="label" translatable="True" default="toolbutton" custom-layout="True"/>
-	<property id="label-widget" parentless-widget="True" create-type="GtkLabel" custom-layout="True"/>
-        <property id="icon-name" themed-icon="True" custom-layout="True"/>
-        <property id="icon-widget" parentless-widget="True" create-type="GtkImage" custom-layout="True"/>
+        <property id="label" translatable="True" default="toolbutton" custom-layout="True"></property>
+	<property id="label-widget" parentless-widget="True" create-type="GtkLabel" custom-layout="True"></property>
+        <property id="icon-name" themed-icon="True" custom-layout="True"></property>
+        <property id="icon-widget" parentless-widget="True" create-type="GtkImage" custom-layout="True"></property>
       </properties>
     </glade-widget-class>
     
-    <glade-widget-class name="GtkToggleToolButton" generic-name="toggletoolbutton" _title="Toggle Tool Button"/>
+    <glade-widget-class name="GtkToggleToolButton" generic-name="toggletoolbutton" _title="Toggle Tool Button"></glade-widget-class>
     
-    <glade-widget-class name="GtkRadioToolButton" generic-name="radiotoolbutton" _title="Radio Tool Button"/>
+    <glade-widget-class name="GtkRadioToolButton" generic-name="radiotoolbutton" _title="Radio Tool Button"></glade-widget-class>
     
-    <glade-widget-class name="GtkMenuToolButton" generic-name="menutoolbutton" use-placeholders="False"
-			_title="Menu Tool Button">
+    <glade-widget-class name="GtkMenuToolButton" generic-name="menutoolbutton" use-placeholders="False" _title="Menu Tool Button">
       <add-child-verify-function>glade_gtk_menu_tool_button_add_verify</add-child-verify-function>
       <add-child-function>glade_gtk_menu_tool_button_add_child</add-child-function>
       <remove-child-function>glade_gtk_menu_tool_button_remove_child</remove-child-function>
@@ -802,7 +784,7 @@ embedded in another object</_tooltip>
       <special-child-type>menu</special-child-type>
 
       <properties>
-	<property id="menu" disabled="True"/>
+	<property id="menu" disabled="True"></property>
       </properties>
 
     </glade-widget-class>
@@ -811,26 +793,26 @@ embedded in another object</_tooltip>
       <properties>
       	<property id="handle-position">
   	  <displayable-values>
-	    <value id="GTK_POS_LEFT" _name="Left"/>
-	    <value id="GTK_POS_RIGHT" _name="Right"/>
-	    <value id="GTK_POS_TOP" _name="Top"/>
-	    <value id="GTK_POS_BOTTOM" _name="Bottom"/>
+	    <value id="GTK_POS_LEFT" _name="Left"></value>
+	    <value id="GTK_POS_RIGHT" _name="Right"></value>
+	    <value id="GTK_POS_TOP" _name="Top"></value>
+	    <value id="GTK_POS_BOTTOM" _name="Bottom"></value>
 	  </displayable-values>
 	</property>
-	<property id="shadow" disabled="True"/>
+	<property id="shadow" disabled="True"></property>
       	<property id="shadow-type">
   	  <displayable-values>
-	    <value id="GTK_SHADOW_NONE" _name="None"/>
-	    <value id="GTK_SHADOW_IN" _name="In"/>
-	    <value id="GTK_SHADOW_OUT" _name="Out"/>
-	    <value id="GTK_SHADOW_ETCHED_IN" _name="Etched In"/>
-	    <value id="GTK_SHADOW_ETCHED_OUT" _name="Etched Out"/>
+	    <value id="GTK_SHADOW_NONE" _name="None"></value>
+	    <value id="GTK_SHADOW_IN" _name="In"></value>
+	    <value id="GTK_SHADOW_OUT" _name="Out"></value>
+	    <value id="GTK_SHADOW_ETCHED_IN" _name="Etched In"></value>
+	    <value id="GTK_SHADOW_ETCHED_OUT" _name="Etched Out"></value>
 	  </displayable-values>
 	</property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkSpinner" generic-name="spinner" _title="Spinner" since="2.20"/>
+    <glade-widget-class name="GtkSpinner" generic-name="spinner" _title="Spinner" since="2.20"></glade-widget-class>
 
     <glade-widget-class name="GtkLabel" generic-name="label" _title="Label">
       <post-create-function>glade_gtk_label_post_create</post-create-function>
@@ -860,48 +842,47 @@ embedded in another object</_tooltip>
 	    <type>GParamInt</type>
 	  </parameter-spec>
         </property>
-      	<property id="label" default="label" translatable="True" custom-layout="True" multiline="True"/>
-	<property id="glade-attributes" _name="Attributes" save="False" custom-layout="True" 
-		  since="2.16">
+      	<property id="label" default="label" translatable="True" custom-layout="True" multiline="True"></property>
+	<property id="glade-attributes" _name="Attributes" save="False" custom-layout="True" since="2.16">
 	  <parameter-spec>
 	    <type>GParamBoxed</type>
 	    <value-type>GladeAttrGList</value-type>
 	  </parameter-spec>
 	  <_tooltip>The pango attributes for this label</_tooltip>
 	</property>
-	<property id="pattern" custom-layout="True"/>
-	<property id="use-markup" custom-layout="True"/>
-
-	<property id="ellipsize" custom-layout="True"/>
-	<property id="justify" custom-layout="True"/>
-	<property id="angle" custom-layout="True"/>
-	<property id="single-line-mode" custom-layout="True"/>
-	<property id="max-width-chars" custom-layout="True"/>
-	<property id="width-chars" custom-layout="True"/>
-	<property id="wrap" custom-layout="True"/>	
-	<property id="wrap-mode" custom-layout="True"/>
-        <property id="selectable" ignore="True" weight="0.5"/>
+	<property id="pattern" custom-layout="True"></property>
+	<property id="use-markup" custom-layout="True"></property>
+
+	<property id="ellipsize" custom-layout="True"></property>
+	<property id="justify" custom-layout="True"></property>
+	<property id="angle" custom-layout="True"></property>
+	<property id="single-line-mode" custom-layout="True"></property>
+	<property id="max-width-chars" custom-layout="True"></property>
+	<property id="width-chars" custom-layout="True"></property>
+	<property id="wrap" custom-layout="True"></property>	
+	<property id="wrap-mode" custom-layout="True"></property>
+        <property id="selectable" ignore="True" weight="0.5"></property>
       	<property id="justify">
   	  <displayable-values>
-	    <value id="GTK_JUSTIFY_LEFT" _name="Left"/>
-	    <value id="GTK_JUSTIFY_RIGHT" _name="Right"/>
-	    <value id="GTK_JUSTIFY_CENTER" _name="Center"/>
-	    <value id="GTK_JUSTIFY_FILL" _name="Fill"/>
+	    <value id="GTK_JUSTIFY_LEFT" _name="Left"></value>
+	    <value id="GTK_JUSTIFY_RIGHT" _name="Right"></value>
+	    <value id="GTK_JUSTIFY_CENTER" _name="Center"></value>
+	    <value id="GTK_JUSTIFY_FILL" _name="Fill"></value>
 	  </displayable-values>
 	</property>
       	<property id="wrap-mode" since="2.10">
   	  <displayable-values>
-             <value id="PANGO_WRAP_WORD" _name="Word"/>
-	    <value id="PANGO_WRAP_CHAR" _name="Character"/>
-	    <value id="PANGO_WRAP_WORD_CHAR" _name="Word Character"/>
+             <value id="PANGO_WRAP_WORD" _name="Word"></value>
+	    <value id="PANGO_WRAP_CHAR" _name="Character"></value>
+	    <value id="PANGO_WRAP_WORD_CHAR" _name="Word Character"></value>
 	  </displayable-values>
 	</property>
-	<property id="track-visited-links" since="2.18"/>
+	<property id="track-visited-links" since="2.18"></property>
       </properties>
 
       <signals>
-	<signal id="activate-current-link" since="2.18"/>
-	<signal id="activate-link" since="2.18"/>
+	<signal id="activate-current-link" since="2.18"></signal>
+	<signal id="activate-link" since="2.18"></signal>
       </signals>
     </glade-widget-class>
 
@@ -913,53 +894,41 @@ embedded in another object</_tooltip>
       <depends-function>glade_gtk_entry_depends</depends-function>
 
       <signals>
-	<signal id="icon-press" since="2.16"/>
-	<signal id="icon-release" since="2.16"/>
-	<signal id="preedit-changed" since="2.20"/>
+	<signal id="icon-press" since="2.16"></signal>
+	<signal id="icon-release" since="2.16"></signal>
+	<signal id="preedit-changed" since="2.20"></signal>
       </signals>
 
       <properties>
-	<property id="text" translatable="True" custom-layout="True"/>
-        <property id="buffer" create-type="GtkEntryBuffer" since="2.18" custom-layout="True"/>
-
-        <property id="inner-border" since="2.10"/>
-        <property id="truncate-multiline" since="2.10"/>
-	<property id="shadow-type" since="2.12"/>
-	<property id="editing-canceled" disabled="True" since="2.20"/>
-	<property id="primary-icon-gicon" disabled="True"/>
-	<property id="secondary-icon-gicon" disabled="True"/>
-	<property id="primary-icon-stock" _name="Primary Stock Icon" since="2.16" custom-layout="True" 
-		  stock-icon="True"/>
-	<property id="secondary-icon-stock" _name="Secondary Stock Icon" since="2.16" custom-layout="True" 
-		  stock-icon="True"/>
-	<property id="primary-icon-pixbuf" _name="Primary Icon Pixbuf" since="2.16" custom-layout="True"/>
-	<property id="secondary-icon-pixbuf" _name="Secondary Icon Pixbuf" since="2.16" custom-layout="True"/>
-	<property id="primary-icon-name" _name="Primary Icon Name" since="2.16" custom-layout="True" 
-		  themed-icon="True"/>
-	<property id="secondary-icon-name" _name="Secondary Icon Name" since="2.16" custom-layout="True" 
-		  themed-icon="True"/>
-	<property id="primary-icon-activatable" _name="Primary Icon Activatable" since="2.16" 
-		  custom-layout="True"/>
-	<property id="secondary-icon-activatable" _name="Secondary Icon Activatable" since="2.16" 
-		  custom-layout="True"/>
-	<property id="primary-icon-sensitive" _name="Primary Icon Sensitive" since="2.16" 
-		  custom-layout="True"/>
-	<property id="secondary-icon-sensitive" _name="Secondary Icon Sensitive" since="2.16" 
-		  custom-layout="True"/>
-	<property id="progress-fraction" _name="Progress Fraction" since="2.16" custom-layout="True"/>
-	<property id="progress-pulse-step" _name="Progress Pulse Step" since="2.16" custom-layout="True"/>
-
-	<property id="invisible-char-set" _name="Invisible Char Set" since="2.16"/>
-	<property id="primary-icon-tooltip-text" translatable="True" multiline="True" 
-		  _name="Primary Icon Tooltip Text" custom-layout="True" since="2.16"/>
-	<property id="secondary-icon-tooltip-text" translatable="True" multiline="True"
-		  _name="Secondary Icon Tooltip Text" custom-layout="True" since="2.16"/>
-	<property id="primary-icon-tooltip-markup" translatable="True" multiline="True"
-		  _name="Primary Icon Tooltip Markup" custom-layout="True" since="2.16"/>
-	<property id="secondary-icon-tooltip-markup" translatable="True" multiline="True"
-		  _name="Secondary Icon Tooltip Markup" custom-layout="True" since="2.16"/>
-
-	<property id="im-module" disabled="True"/>
+	<property id="text" translatable="True" custom-layout="True"></property>
+        <property id="buffer" create-type="GtkEntryBuffer" since="2.18" custom-layout="True"></property>
+
+        <property id="inner-border" since="2.10"></property>
+        <property id="truncate-multiline" since="2.10"></property>
+	<property id="shadow-type" since="2.12"></property>
+	<property id="editing-canceled" disabled="True" since="2.20"></property>
+	<property id="primary-icon-gicon" disabled="True"></property>
+	<property id="secondary-icon-gicon" disabled="True"></property>
+	<property id="primary-icon-stock" _name="Primary Stock Icon" since="2.16" custom-layout="True" stock-icon="True"></property>
+	<property id="secondary-icon-stock" _name="Secondary Stock Icon" since="2.16" custom-layout="True" stock-icon="True"></property>
+	<property id="primary-icon-pixbuf" _name="Primary Icon Pixbuf" since="2.16" custom-layout="True"></property>
+	<property id="secondary-icon-pixbuf" _name="Secondary Icon Pixbuf" since="2.16" custom-layout="True"></property>
+	<property id="primary-icon-name" _name="Primary Icon Name" since="2.16" custom-layout="True" themed-icon="True"></property>
+	<property id="secondary-icon-name" _name="Secondary Icon Name" since="2.16" custom-layout="True" themed-icon="True"></property>
+	<property id="primary-icon-activatable" _name="Primary Icon Activatable" since="2.16" custom-layout="True"></property>
+	<property id="secondary-icon-activatable" _name="Secondary Icon Activatable" since="2.16" custom-layout="True"></property>
+	<property id="primary-icon-sensitive" _name="Primary Icon Sensitive" since="2.16" custom-layout="True"></property>
+	<property id="secondary-icon-sensitive" _name="Secondary Icon Sensitive" since="2.16" custom-layout="True"></property>
+	<property id="progress-fraction" _name="Progress Fraction" since="2.16" custom-layout="True"></property>
+	<property id="progress-pulse-step" _name="Progress Pulse Step" since="2.16" custom-layout="True"></property>
+
+	<property id="invisible-char-set" _name="Invisible Char Set" since="2.16"></property>
+	<property id="primary-icon-tooltip-text" translatable="True" multiline="True" _name="Primary Icon Tooltip Text" custom-layout="True" since="2.16"></property>
+	<property id="secondary-icon-tooltip-text" translatable="True" multiline="True" _name="Secondary Icon Tooltip Text" custom-layout="True" since="2.16"></property>
+	<property id="primary-icon-tooltip-markup" translatable="True" multiline="True" _name="Primary Icon Tooltip Markup" custom-layout="True" since="2.16"></property>
+	<property id="secondary-icon-tooltip-markup" translatable="True" multiline="True" _name="Secondary Icon Tooltip Markup" custom-layout="True" since="2.16"></property>
+
+	<property id="im-module" disabled="True"></property>
 
 	<!-- Virtual edit mode properties -->
         <property id="use-entry-buffer" visible="False" save="False" default="False">
@@ -979,8 +948,7 @@ embedded in another object</_tooltip>
         </property>
 
 	<!-- Atk activate property -->
-	<property id="atk-activate" _name="Activate" ignore="True" atk-property="True" save="False"
-		  multiline="True">
+	<property id="atk-activate" _name="Activate" ignore="True" atk-property="True" save="False" multiline="True">
 	  <parameter-spec>
 	    <type>GParamString</type>
 	  </parameter-spec>
@@ -994,13 +962,13 @@ embedded in another object</_tooltip>
       <set-property-function>glade_gtk_text_view_set_property</set-property-function>
 
       <properties>
-      	<property id="im-module" disabled="True"/>
+      	<property id="im-module" disabled="True"></property>
       	<property id="wrap-mode">
   	  <displayable-values>
-	    <value id="GTK_WRAP_NONE" _name="None"/>
-	    <value id="GTK_WRAP_CHAR" _name="Character"/>
-	    <value id="GTK_WRAP_WORD" _name="Word"/>
-	    <value id="GTK_WRAP_WORD_CHAR" _name="Word Character"/>
+	    <value id="GTK_WRAP_NONE" _name="None"></value>
+	    <value id="GTK_WRAP_CHAR" _name="Character"></value>
+	    <value id="GTK_WRAP_WORD" _name="Word"></value>
+	    <value id="GTK_WRAP_WORD_CHAR" _name="Word Character"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -1014,12 +982,11 @@ embedded in another object</_tooltip>
       <write-widget-function>glade_gtk_button_write_widget</write-widget-function>
 
       <properties>
-	<property id="receives-default" save-always="True"/>
-	<property id="image" parentless-widget="True" create-type="GtkImage" custom-layout="True"/>
-	<property id="use-stock" visible="False" custom-layout="True"/>
-      	<property id="label" default="button" translatable="True" custom-layout="True" save="False"
-		  multiline="True"/>
-	<property id="use-underline" custom-layout="True"/>
+	<property id="receives-default" save-always="True"></property>
+	<property id="image" parentless-widget="True" create-type="GtkImage" custom-layout="True"></property>
+	<property id="use-stock" visible="False" custom-layout="True"></property>
+      	<property id="label" default="button" translatable="True" custom-layout="True" save="False" multiline="True"></property>
+	<property id="use-underline" custom-layout="True"></property>
 	<property id="stock" _name="Stock Button" stock="True" save="False" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamString</type>
@@ -1031,7 +998,7 @@ embedded in another object</_tooltip>
 	    <type>GParamBoolean</type>
 	  </parameter-spec>
         </property>
-	<property id="image-position" custom-layout="True"/>
+	<property id="image-position" custom-layout="True"></property>
 	<property id="response-id" _name="Response ID" default="0" common="False" ignore="True" save="False">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -1040,8 +1007,8 @@ embedded in another object</_tooltip>
 	</property>
 
 	<!-- GtkActivatable -->
-      	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16"/>
-      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" default="False" since="2.16"/>
+      	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16"></property>
+      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" default="False" since="2.16"></property>
 
 	<!-- Atk click property -->
 	<property id="atk-click" _name="Click" ignore="True" atk-property="True" save="False" multiline="True">
@@ -1060,8 +1027,7 @@ embedded in another object</_tooltip>
 	</property>
 
 	<!-- Atk release property -->
-	<property id="atk-release" _name="Release" ignore="True" atk-property="True" save="False" 
-		  multiline="True">
+	<property id="atk-release" _name="Release" ignore="True" atk-property="True" save="False" multiline="True">
 	  <parameter-spec>
 	    <type>GParamString</type>
 	  </parameter-spec>
@@ -1073,14 +1039,14 @@ embedded in another object</_tooltip>
   
     <glade-widget-class name="GtkToggleButton" generic-name="togglebutton" _title="Toggle Button">
       <properties>
-      	<property id="label" default="togglebutton"/>
+      	<property id="label" default="togglebutton"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkCheckButton" generic-name="checkbutton" _title="Check Button">
       <properties>
-      	<property id="label" default="checkbutton"/>
-	<property id="draw-indicator" default="True" save-always="True"/>
+      	<property id="label" default="checkbutton"></property>
+	<property id="draw-indicator" default="True" save-always="True"></property>
       </properties>
     </glade-widget-class>
 
@@ -1089,18 +1055,18 @@ embedded in another object</_tooltip>
       <set-property-function>glade_gtk_spin_button_set_property</set-property-function>
 
       <signals>
-	<signal id="wrapped" since="2.10"/>
-	<signal id="preedit-changed" since="2.20"/>
+	<signal id="wrapped" since="2.10"></signal>
+	<signal id="preedit-changed" since="2.20"></signal>
       </signals>
 
       <properties>
-        <property id="text" disabled="True"/>
-        <property id="value" disabled="True"/>
-        <property id="adjustment" default="0 0 100 1 10 0"/>
+        <property id="text" disabled="True"></property>
+        <property id="value" disabled="True"></property>
+        <property id="adjustment" default="0 0 100 1 10 0"></property>
         <property id="update-policy">
   	  <displayable-values>
-	    <value id="GTK_UPDATE_ALWAYS" _name="Always"/>
-	    <value id="GTK_UPDATE_IF_VALID" _name="If Valid"/>
+	    <value id="GTK_UPDATE_ALWAYS" _name="Always"></value>
+	    <value id="GTK_UPDATE_IF_VALID" _name="If Valid"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -1109,7 +1075,7 @@ embedded in another object</_tooltip>
     <glade-widget-class name="GtkRadioButton" generic-name="radiobutton" _title="Radio Button">
       <set-property-function>glade_gtk_radio_button_set_property</set-property-function>
       <properties>
-      	<property id="label" default="radiobutton"/>
+      	<property id="label" default="radiobutton"></property>
       </properties>
     </glade-widget-class>
 
@@ -1117,67 +1083,65 @@ embedded in another object</_tooltip>
       <set-property-function>glade_gtk_file_chooser_button_set_property</set-property-function>
 
       <signals>
-	<signal id="file-set" since="2.12"/>
+	<signal id="file-set" since="2.12"></signal>
       </signals>
 
       <properties>
-	<property id="title" translatable="True"/>
-	<property id="size" disabled="True"/>
-	<property id="dialog" parentless-widget="True" create-type="GtkFileChooserDialog" />
-	<property id="focus-on-click" since="2.10"/>
+	<property id="title" translatable="True"></property>
+	<property id="size" disabled="True"></property>
+	<property id="dialog" parentless-widget="True" create-type="GtkFileChooserDialog"></property>
+	<property id="focus-on-click" since="2.10"></property>
         <property id="action">
   	  <displayable-values>
-	    <value id="GTK_FILE_CHOOSER_ACTION_SAVE" _name="Save"/>
-	    <value id="GTK_FILE_CHOOSER_ACTION_OPEN" _name="Open"/>
-	    <value id="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" _name="Select Folder"/>
-	    <value id="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" _name="Create Folder"/>
+	    <value id="GTK_FILE_CHOOSER_ACTION_SAVE" _name="Save"></value>
+	    <value id="GTK_FILE_CHOOSER_ACTION_OPEN" _name="Open"></value>
+	    <value id="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" _name="Select Folder"></value>
+	    <value id="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" _name="Create Folder"></value>
 	  </displayable-values>
         </property>
-	<property id="create-folders" since="2.18"/>
-	<property id="select-multiple" disabled="True"/>
+	<property id="create-folders" since="2.18"></property>
+	<property id="select-multiple" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkScaleButton" generic-name="scalebutton" _title="Scale Button" since="2.12">
       <properties>
-        <property id="orientation" since="2.14"/>
+        <property id="orientation" since="2.14"></property>
 
 	<!-- These props dont apply to scale buttons -->
-	<property id="glade-type" disabled="True"/>
-	<property id="label" disabled="True"/>
-	<property id="use-underline" disabled="True"/>
-	<property id="stock" disabled="True"/>
+	<property id="glade-type" disabled="True"></property>
+	<property id="label" disabled="True"></property>
+	<property id="use-underline" disabled="True"></property>
+	<property id="stock" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkVolumeButton" generic-name="volumebutton" _title="Volume Button">
       <properties>
-        <property id="use-symbolic" since="3.0"/>
+        <property id="use-symbolic" since="3.0"></property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkFileChooserWidget" generic-name="filechooserwidget" 
-			_title="File Chooser Widget">
+    <glade-widget-class name="GtkFileChooserWidget" generic-name="filechooserwidget" _title="File Chooser Widget">
       <post-create-function>glade_gtk_file_chooser_widget_post_create</post-create-function>
       <properties>
-        <property id="size" default="1" query="False" />
-	<property id="extra-widget" parentless-widget="True" />
-	<property id="preview-widget" parentless-widget="True" />
-	<property id="create-folders" since="2.18"/>
+        <property id="size" default="1" query="False"></property>
+	<property id="extra-widget" parentless-widget="True"></property>
+	<property id="preview-widget" parentless-widget="True"></property>
+	<property id="create-folders" since="2.18"></property>
       </properties>
 
       <signals>
-	<signal id="file-set" since="2.12"/>
+	<signal id="file-set" since="2.12"></signal>
       </signals>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkAppChooserWidget" generic-name="appchooserwidget" 
-			_title="Application Chooser Widget" since="3.0">
+    <glade-widget-class name="GtkAppChooserWidget" generic-name="appchooserwidget" _title="Application Chooser Widget" since="3.0">
       <properties>
-	<property id="size" disabled="True"/>
-	<property id="spacing" disabled="True"/>
-	<property id="homogeneous" disabled="True"/>
-	<property id="orientation" disabled="True"/>
+	<property id="size" disabled="True"></property>
+	<property id="spacing" disabled="True"></property>
+	<property id="homogeneous" disabled="True"></property>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
@@ -1185,40 +1149,38 @@ embedded in another object</_tooltip>
       <create-editable-function>glade_gtk_container_create_editable</create-editable-function>
       <set-property-function>glade_gtk_color_button_set_property</set-property-function>
       <properties>
-	<property id="title" translatable="True"/>
-	<property id="color" default="Black" optional="True" optional-default="False"/>
-	<property id="alpha" optional="True" optional-default="False"/>
-	<property id="rgba" default="Black" optional="True" optional-default="False" since="3.0"/>
+	<property id="title" translatable="True"></property>
+	<property id="color" default="Black" optional="True" optional-default="False"></property>
+	<property id="alpha" optional="True" optional-default="False"></property>
+	<property id="rgba" default="Black" optional="True" optional-default="False" since="3.0"></property>
 
 	<!-- These props dont apply to color buttons -->
-	<property id="glade-type" disabled="True"/>
-	<property id="label" disabled="True"/>
-	<property id="use-underline" disabled="True"/>
-	<property id="stock" disabled="True"/>
+	<property id="glade-type" disabled="True"></property>
+	<property id="label" disabled="True"></property>
+	<property id="use-underline" disabled="True"></property>
+	<property id="stock" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkFontButton" generic-name="fontbutton" _title="Font Button">
       <create-editable-function>glade_gtk_container_create_editable</create-editable-function>
       <properties>
-	<property id="title" translatable="True"/>
+	<property id="title" translatable="True"></property>
 
 	<!-- These props dont apply to font buttons -->
-	<property id="glade-type" disabled="True"/>
-	<property id="label" disabled="True"/>
-	<property id="use-underline" disabled="True"/>
-	<property id="stock" disabled="True"/>
+	<property id="glade-type" disabled="True"></property>
+	<property id="label" disabled="True"></property>
+	<property id="use-underline" disabled="True"></property>
+	<property id="stock" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkComboBox" generic-name="combobox" _title="Combo Box">
-      <post-create-function>glade_gtk_combo_box_post_create</post-create-function>
       <set-property-function>glade_gtk_combo_box_set_property</set-property-function>
       <add-child-verify-function>glade_gtk_cell_layout_add_verify</add-child-verify-function>
       <add-child-function>glade_gtk_cell_layout_add_child</add-child-function>
       <remove-child-function>glade_gtk_cell_layout_remove_child</remove-child-function> 
       <get-children-function>glade_gtk_combo_box_get_children</get-children-function>
-      <get-internal-child-function>glade_gtk_combo_box_get_internal_child</get-internal-child-function>
       <read-child-function>glade_gtk_cell_layout_read_child</read-child-function>
       <write-child-function>glade_gtk_cell_layout_write_child</write-child-function>
       <action-activate-function>glade_gtk_cell_layout_action_activate_as_widget</action-activate-function>
@@ -1226,34 +1188,38 @@ embedded in another object</_tooltip>
       <child-get-property-function>glade_gtk_cell_layout_get_child_property</child-get-property-function>
       
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
-
+      
+      <internal-children>
+        <object name="entry"></object>
+      </internal-children>
+      
       <signals>
-	<signal id="move-action" since="2.12"/>
-	<signal id="popdown" since="2.12"/>
-	<signal id="popup" since="2.12"/>
+	<signal id="move-action" since="2.12"></signal>
+	<signal id="popdown" since="2.12"></signal>
+	<signal id="popup" since="2.12"></signal>
       </signals>
       <properties>
-        <property id="model" create-type="GtkListStore"/>
-        <property id="popup-shown" since="2.10"/>
-        <property id="tearoff-title" since="2.10"/>
-        <property id="active" ignore="True"/>
-        <property id="active-id" since="3.0"/>
-        <property id="id-column" since="3.0"/>
-        <property id="column-span-column" ignore="True"/>
-        <property id="row-span-column" ignore="True"/>
-	<property id="entry-text-column" since="2.24"/>
-	<property id="has-entry" since="2.24"/>
-	<property id="popup-fixed-width" since="3.0"/>
+        <property id="model" create-type="GtkListStore"></property>
+        <property id="popup-shown" since="2.10"></property>
+        <property id="tearoff-title" since="2.10"></property>
+        <property id="active" ignore="True"></property>
+        <property id="active-id" since="3.0"></property>
+        <property id="id-column" since="3.0"></property>
+        <property id="column-span-column" ignore="True"></property>
+        <property id="row-span-column" ignore="True"></property>
+	<property id="entry-text-column" since="2.24"></property>
+	<property id="has-entry" since="2.24"></property>
+	<property id="popup-fixed-width" since="3.0"></property>
 	<property id="button-sensitivity">
   	  <displayable-values>
-	    <value id="GTK_SENSITIVITY_AUTO" _name="Automatic"/>
-	    <value id="GTK_SENSITIVITY_ON" _name="On"/>
-	    <value id="GTK_SENSITIVITY_OFF" _name="Off"/>
+	    <value id="GTK_SENSITIVITY_AUTO" _name="Automatic"></value>
+	    <value id="GTK_SENSITIVITY_ON" _name="On"></value>
+	    <value id="GTK_SENSITIVITY_OFF" _name="Off"></value>
 	  </displayable-values>
         </property>
-	<property id="editing-canceled" disabled="True" since="2.20"/>
+	<property id="editing-canceled" disabled="True" since="2.20"></property>
 
 	<!-- Atk press property -->
 	<property id="atk-press" _name="Press" ignore="True" atk-property="True" save="False" multiline="True">
@@ -1275,7 +1241,7 @@ embedded in another object</_tooltip>
       <write-widget-function>glade_gtk_combo_box_text_write_widget</write-widget-function>
 
       <properties>
-        <property id="model" disabled="True"/>
+        <property id="model" disabled="True"></property>
 	<property id="glade-items" _name="Items" save="False" since="2.24">
 	  <parameter-spec>
 	    <type>GParamBoxed</type>
@@ -1286,43 +1252,42 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkAppChooserButton" generic-name="appchooserbutton" 
-			_title="Application Chooser Button" since="3.0">
+    <glade-widget-class name="GtkAppChooserButton" generic-name="appchooserbutton" _title="Application Chooser Button" since="3.0">
       <properties>
-	<property id="model" disabled="True"/>
-	<property id="wrap-width" disabled="True"/>
-	<property id="row-span-column" disabled="True"/>
-	<property id="column-span-column" disabled="True"/>
-	<property id="active" disabled="True"/>
-	<property id="add-tearoffs" disabled="True"/>
-	<property id="has-frame" disabled="True"/>
-	<property id="tearoff-title" disabled="True"/>
-	<property id="has-entry" disabled="True"/>
-	<property id="button-sensitivity" disabled="True"/>
-	<property id="entry-text-column" disabled="True"/>
-	<property id="id-column" disabled="True"/>
-	<property id="active-id" disabled="True"/>
-	<property id="cell-area" disabled="True"/>
+	<property id="model" disabled="True"></property>
+	<property id="wrap-width" disabled="True"></property>
+	<property id="row-span-column" disabled="True"></property>
+	<property id="column-span-column" disabled="True"></property>
+	<property id="active" disabled="True"></property>
+	<property id="add-tearoffs" disabled="True"></property>
+	<property id="has-frame" disabled="True"></property>
+	<property id="tearoff-title" disabled="True"></property>
+	<property id="has-entry" disabled="True"></property>
+	<property id="button-sensitivity" disabled="True"></property>
+	<property id="entry-text-column" disabled="True"></property>
+	<property id="id-column" disabled="True"></property>
+	<property id="active-id" disabled="True"></property>
+	<property id="cell-area" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkProgressBar" generic-name="progressbar" _title="Progress Bar">
       <properties>
-        <property id="text" translatable="True"/>
-        <property id="show-text" since="3.0"/>
-        <property id="activity-blocks" disabled="True"/>
-	<property id="activity-step" disabled="True"/>
-	<property id="bar-style" disabled="True"/>
+        <property id="text" translatable="True"></property>
+        <property id="show-text" since="3.0"></property>
+        <property id="activity-blocks" disabled="True"></property>
+	<property id="activity-step" disabled="True"></property>
+	<property id="bar-style" disabled="True"></property>
        	<property id="bar-style">
   	  <displayable-values>
-	    <value id="GTK_PROGRESS_CONTINUOUS" _name="Continuous"/>
-	    <value id="GTK_PROGRESS_DISCRETE" _name="Discrete"/>
+	    <value id="GTK_PROGRESS_CONTINUOUS" _name="Continuous"></value>
+	    <value id="GTK_PROGRESS_DISCRETE" _name="Discrete"></value>
 	  </displayable-values>
 	</property>
-        <property id="min-horizontal-bar-height" since="2.14"/>
-        <property id="min-horizontal-bar-width" since="2.14"/>
-        <property id="min-vertical-bar-height" since="2.14"/>
-        <property id="min-vertical-bar-width" since="2.14"/>
+        <property id="min-horizontal-bar-height" since="2.14"></property>
+        <property id="min-horizontal-bar-width" since="2.14"></property>
+        <property id="min-vertical-bar-height" since="2.14"></property>
+        <property id="min-vertical-bar-width" since="2.14"></property>
       </properties>
     </glade-widget-class>
 
@@ -1338,41 +1303,45 @@ embedded in another object</_tooltip>
 	    <type>GParamInt</type>
 	  </parameter-spec>
 	</property>
-	<property id="stock" stock-icon="True" custom-layout="True" default="gtk-missing-image"/>
-	<property id="icon-name" _name="Icon Name" themed-icon="True" custom-layout="True" />
-	<property id="pixbuf" _name="File Name" custom-layout="True"/>
-	<property id="pixel-size" custom-layout="True"/>
+	<property id="stock" stock-icon="True" custom-layout="True" default="gtk-missing-image"></property>
+	<property id="icon-name" _name="Icon Name" themed-icon="True" custom-layout="True"></property>
+	<property id="pixbuf" _name="File Name" custom-layout="True"></property>
+	<property id="pixel-size" custom-layout="True"></property>
 	<!-- We have to save/load icon-size as int, and fake the enum -->
-	<property id="icon-size" _name="Icon Size" custom-layout="True" 
-		  default="GTK_ICON_SIZE_BUTTON" save="False">
+	<property id="icon-size" _name="Icon Size" custom-layout="True" default="GTK_ICON_SIZE_BUTTON" save="False">
 	  <parameter-spec>
 	    <type>GParamEnum</type>
 	    <value-type>GtkIconSize</value-type>
 	  </parameter-spec>
 	  <_tooltip>A symbolic icon size for the stock icon</_tooltip>
 	</property>
-	<property id="pixbuf-animation" disabled="True"/>
-	<property id="file" disabled="True"/>
-	<property id="gicon" disabled="True"/>
-	<property id="pixmap" disabled="True"/>
-	<property id="image" disabled="True"/>
-	<property id="mask" disabled="True"/>
+	<property id="pixbuf-animation" disabled="True"></property>
+	<property id="file" disabled="True"></property>
+	<property id="gicon" disabled="True"></property>
+	<property id="pixmap" disabled="True"></property>
+	<property id="image" disabled="True"></property>
+	<property id="mask" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkDialog" generic-name="dialog" _title="Dialog Box" 
-			default-width="320" default-height="260">
+    <glade-widget-class name="GtkDialog" generic-name="dialog" _title="Dialog Box" default-width="320" default-height="260">
       <post-create-function>glade_gtk_dialog_post_create</post-create-function>
-      <get-internal-child-function>glade_gtk_dialog_get_internal_child</get-internal-child-function>
-      <get-children-function>glade_gtk_dialog_get_children</get-children-function>
       <read-child-function>glade_gtk_dialog_read_child</read-child-function>
       <write-child-function>glade_gtk_dialog_write_child</write-child-function>
 
+      <internal-children>
+        <object name="vbox">
+          <internal-children>
+            <object name="action_area"></object>
+          </internal-children>
+        </object>
+      </internal-children>
+
       <properties>
-	<property id="default-width"  default="320" optional="True" optional-default="False"/>
-	<property id="default-height" default="260" optional="True" optional-default="False"/>
-	<property id="has-separator"  default="False"/>
-	<property id="type-hint" default="GDK_WINDOW_TYPE_HINT_DIALOG" save-always="True"/>
+        <property id="default-width" default="320" optional="True" optional-default="False"></property>
+        <property id="default-height" default="260" optional="True" optional-default="False"></property>
+        <property id="has-separator" default="False"></property>
+        <property id="type-hint" default="GDK_WINDOW_TYPE_HINT_DIALOG" save-always="True"></property>
       </properties>
 
     </glade-widget-class>
@@ -1392,33 +1361,33 @@ embedded in another object</_tooltip>
 
       <packing-actions>
         <action id="insert_row" _name="Insert Row" stock="gtk-add">
-          <action id="before" _name="Before"/>
-          <action id="after" _name="After"/>
+          <action id="before" _name="Before"></action>
+          <action id="after" _name="After"></action>
         </action>
         <action id="insert_column" _name="Insert Column" stock="gtk-add">
-          <action id="before" _name="Before"/>
-          <action id="after" _name="After"/>
+          <action id="before" _name="Before"></action>
+          <action id="after" _name="After"></action>
         </action>
-        <action id="remove_row" _name="Remove Row" stock="gtk-remove"/>
-        <action id="remove_column" _name="Remove Column" stock="gtk-remove"/>
+        <action id="remove_row" _name="Remove Row" stock="gtk-remove"></action>
+        <action id="remove_column" _name="Remove Column" stock="gtk-remove"></action>
       </packing-actions>
 
       <properties>
-	<property id="n-rows" default="3" query="True" needs-sync="True"/>
-	<property id="n-columns" default="3" query="True" needs-sync="True"/>
+	<property id="n-rows" default="3" query="True" needs-sync="True"></property>
+	<property id="n-columns" default="3" query="True" needs-sync="True"></property>
       </properties>
       
       <packing-properties>
         <property id="x-options" transfer-on-paste="True">
           <displayable-values>
-            <value id="GTK_EXPAND" _name="Expand"/>
-            <value id="GTK_SHRINK" _name="Shrink"/>
-            <value id="GTK_FILL" _name="Fill"/>
+            <value id="GTK_EXPAND" _name="Expand"></value>
+            <value id="GTK_SHRINK" _name="Shrink"></value>
+            <value id="GTK_FILL" _name="Fill"></value>
           </displayable-values>
         </property>
-        <property id="y-options" transfer-on-paste="True"/>
-        <property id="x-padding" transfer-on-paste="True"/>
-        <property id="y-padding" transfer-on-paste="True"/>
+        <property id="y-options" transfer-on-paste="True"></property>
+        <property id="x-padding" transfer-on-paste="True"></property>
+        <property id="y-padding" transfer-on-paste="True"></property>
       </packing-properties>
     </glade-widget-class>
 
@@ -1437,15 +1406,15 @@ embedded in another object</_tooltip>
 
       <packing-actions>
         <action id="insert_row" _name="Insert Row" stock="gtk-add">
-          <action id="before" _name="Before"/>
-          <action id="after" _name="After"/>
+          <action id="before" _name="Before"></action>
+          <action id="after" _name="After"></action>
         </action>
         <action id="insert_column" _name="Insert Column" stock="gtk-add">
-          <action id="before" _name="Before"/>
-          <action id="after" _name="After"/>
+          <action id="before" _name="Before"></action>
+          <action id="after" _name="After"></action>
         </action>
-        <action id="remove_row" _name="Remove Row" stock="gtk-remove"/>
-        <action id="remove_column" _name="Remove Column" stock="gtk-remove"/>
+        <action id="remove_row" _name="Remove Row" stock="gtk-remove"></action>
+        <action id="remove_column" _name="Remove Column" stock="gtk-remove"></action>
       </packing-actions>
 
       <properties>
@@ -1464,10 +1433,10 @@ embedded in another object</_tooltip>
       </properties>
       
       <packing-properties>
-        <property id="left-attach" save-always="True" needs-sync="True"/>
-        <property id="top-attach" save-always="True" needs-sync="True"/>
-        <property id="width" save-always="True"/>
-        <property id="height" save-always="True"/>
+        <property id="left-attach" save-always="True" needs-sync="True"></property>
+        <property id="top-attach" save-always="True" needs-sync="True"></property>
+        <property id="width" save-always="True"></property>
+        <property id="height" save-always="True"></property>
       </packing-properties>
     </glade-widget-class>
 
@@ -1478,8 +1447,8 @@ embedded in another object</_tooltip>
       <child-set-property-function>glade_gtk_paned_set_child_property</child-set-property-function>
       <child-get-property-function>glade_gtk_paned_get_child_property</child-get-property-function>
       <packing-properties>
-        <property id="resize" transfer-on-paste="True" save-always="True"/>
-        <property id="shrink" transfer-on-paste="True" save-always="True"/>
+        <property id="resize" transfer-on-paste="True" save-always="True"></property>
+        <property id="shrink" transfer-on-paste="True" save-always="True"></property>
         <!--
 	Whether to add the child to the top/left or bottom/right pane.
 	This virtual property is used to remember child position in undo/redo.
@@ -1494,12 +1463,12 @@ embedded in another object</_tooltip>
 
     <glade-widget-class name="GtkHPaned" generic-name="hpaned" _title="Horizontal Panes">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
     <glade-widget-class name="GtkVPaned" generic-name="vpaned" _title="Vertical Panes">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
   
@@ -1517,21 +1486,21 @@ embedded in another object</_tooltip>
       <child-action-activate-function>glade_gtk_notebook_child_action_activate</child-action-activate-function>
 
       <signals>
-	<signal id="page-added" since="2.10"/>
-	<signal id="page-removed" since="2.10"/>
-	<signal id="page-reordered" since="2.10"/>
-	<signal id="create-window" since="2.12"/>
+	<signal id="page-added" since="2.10"></signal>
+	<signal id="page-removed" since="2.10"></signal>
+	<signal id="page-reordered" since="2.10"></signal>
+	<signal id="create-window" since="2.12"></signal>
       </signals>
 
       <packing-actions>
-        <action id="insert_page_before" _name="Insert Page Before" stock="gtk-add"/>
-        <action id="insert_page_after" _name="Insert Page After" stock="gtk-add"/>
-        <action id="remove_page" _name="Remove Page"  stock="gtk-remove"/>
+        <action id="insert_page_before" _name="Insert Page Before" stock="gtk-add"></action>
+        <action id="insert_page_after" _name="Insert Page After" stock="gtk-add"></action>
+        <action id="remove_page" _name="Remove Page" stock="gtk-remove"></action>
       </packing-actions>
 
       <properties>
-	<property id="group" since="2.12"/>
-	<property id="group-name" since="2.24"/>
+	<property id="group" since="2.12"></property>
+	<property id="group-name" since="2.24"></property>
 	<property id="page" save="False">
 	  <_tooltip>Set the current page (strictly for editing purposes)</_tooltip>
 	</property>
@@ -1546,12 +1515,12 @@ embedded in another object</_tooltip>
       </properties>
 
       <packing-properties>
-        <property id="tab-label" disabled="True"/>
+        <property id="tab-label" disabled="True"></property>
       </packing-properties>
     </glade-widget-class>
 
 
-    <glade-widget-class name="GtkAlignment" generic-name="alignment" _title="Alignment"/>
+    <glade-widget-class name="GtkAlignment" generic-name="alignment" _title="Alignment"></glade-widget-class>
 
     <glade-widget-class name="GtkFrame" generic-name="frame" _title="Frame">
       <post-create-function>glade_gtk_frame_post_create</post-create-function>
@@ -1562,27 +1531,27 @@ embedded in another object</_tooltip>
       <special-child-type>type</special-child-type>
 
       <properties>
-	<property id="label" disabled="True"/>
-	<property id="shadow" disabled="True"/>
-	<property id="label-widget" disabled="True"/>
-	<property id="label-xalign" default="0.0" save-always="True"/>
-      	<property id="shadow-type" default="GTK_SHADOW_NONE"/>
+	<property id="label" disabled="True"></property>
+	<property id="shadow" disabled="True"></property>
+	<property id="label-widget" disabled="True"></property>
+	<property id="label-xalign" default="0.0" save-always="True"></property>
+      	<property id="shadow-type" default="GTK_SHADOW_NONE"></property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkAspectFrame" generic-name="aspectframe" _title="Aspect Frame"/>
+    <glade-widget-class name="GtkAspectFrame" generic-name="aspectframe" _title="Aspect Frame"></glade-widget-class>
 
     <glade-widget-class name="GtkRange" _title="Range">
       <properties>
-        <property id="fill-level" since="2.12"/>
-        <property id="restrict-to-fill-level" since="2.12"/>
-        <property id="show-fill-level" since="2.12"/>
-        <property id="adjustment" default="0 0 100 1 10 10"/>
+        <property id="fill-level" since="2.12"></property>
+        <property id="restrict-to-fill-level" since="2.12"></property>
+        <property id="show-fill-level" since="2.12"></property>
+        <property id="adjustment" default="0 0 100 1 10 10"></property>
       	<property id="update-policy">
   	  <displayable-values>
-	    <value id="GTK_UPDATE_CONTINUOUS" _name="Continuous"/>
-	    <value id="GTK_UPDATE_DISCONTINUOUS" _name="Discontinuous"/>
-	    <value id="GTK_UPDATE_DELAYED" _name="Delayed"/>
+	    <value id="GTK_UPDATE_CONTINUOUS" _name="Continuous"></value>
+	    <value id="GTK_UPDATE_DISCONTINUOUS" _name="Discontinuous"></value>
+	    <value id="GTK_UPDATE_DELAYED" _name="Delayed"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -1590,26 +1559,26 @@ embedded in another object</_tooltip>
     
     <glade-widget-class name="GtkScale" generic-name="scale" _title="Scale">
       <properties>
-	<property id="orientation" default="GTK_ORIENTATION_VERTICAL"/>
+	<property id="orientation" default="GTK_ORIENTATION_VERTICAL"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkHScale" generic-name="hscale" _title="Horizontal Scale">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
     <glade-widget-class name="GtkVScale" generic-name="vscale" _title="Vertical Scale">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkCalendar" generic-name="calendar" _title="Calendar">
       <properties>
-        <property id="detail-height-rows" since="2.14"/>
-        <property id="detail-width-chars" since="2.14"/>
-        <property id="show-details" since="2.14"/>
+        <property id="detail-height-rows" since="2.14"></property>
+        <property id="detail-width-chars" since="2.14"></property>
+        <property id="show-details" since="2.14"></property>
       </properties>
     </glade-widget-class>
     
@@ -1618,22 +1587,21 @@ embedded in another object</_tooltip>
       <!-- We do not want glade_gtk_container_post_create be executed -->
       <post-create-function>empty</post-create-function>
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
 
       <properties>
-        <property id="accel-group" since="2.14"/>
-        <property id="accel-path" since="2.14"/>
-        <property id="active" disabled="True" since="2.14"/>
-        <property id="attach-widget" disabled="True" since="2.14"/>
-        <property id="monitor" disabled="True" since="2.14"/>
-        <property id="reserve-toggle-size" since="2.18"/>
+        <property id="accel-group" since="2.14"></property>
+        <property id="accel-path" since="2.14"></property>
+        <property id="active" disabled="True" since="2.14"></property>
+        <property id="attach-widget" disabled="True" since="2.14"></property>
+        <property id="monitor" disabled="True" since="2.14"></property>
+        <property id="reserve-toggle-size" since="2.18"></property>
       </properties>
 
     </glade-widget-class>
 
-    <glade-widget-class name="GtkRecentChooserMenu" generic-name="recentchoosermenu" 
-			_title="Recent Chooser Menu" toplevel="True">
+    <glade-widget-class name="GtkRecentChooserMenu" generic-name="recentchoosermenu" _title="Recent Chooser Menu" toplevel="True">
 
       <create-editable-function>glade_gtk_recent_chooser_menu_create_editable</create-editable-function>
       <set-property-function>glade_gtk_recent_chooser_menu_set_property</set-property-function>
@@ -1642,18 +1610,18 @@ embedded in another object</_tooltip>
     
     <glade-widget-class name="GtkScrollbar" generic-name="scrollbar" _title="Scrollbar">
       <properties>
-	<property id="orientation" default="GTK_ORIENTATION_VERTICAL"/>
+	<property id="orientation" default="GTK_ORIENTATION_VERTICAL"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkHScrollbar" generic-name="hscrollbar" _title="Horizontal Scrollbar">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
     <glade-widget-class name="GtkVScrollbar" generic-name="vscrollbar" _title="Vertical Scrollbar">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
@@ -1661,12 +1629,12 @@ embedded in another object</_tooltip>
       <properties>
       	<property id="layout-style" default="GTK_BUTTONBOX_START">
   	  <displayable-values>
-	    <value id="GTK_BUTTONBOX_DEFAULT_STYLE" _name="Default"/>
-	    <value id="GTK_BUTTONBOX_SPREAD" _name="Spread"/>
-	    <value id="GTK_BUTTONBOX_EDGE" _name="Edge"/>
-	    <value id="GTK_BUTTONBOX_START" _name="Start"/>
-	    <value id="GTK_BUTTONBOX_END" _name="End"/>
-	    <value id="GTK_BUTTONBOX_CENTER" _name="Center"/>
+	    <value id="GTK_BUTTONBOX_DEFAULT_STYLE" _name="Default"></value>
+	    <value id="GTK_BUTTONBOX_SPREAD" _name="Spread"></value>
+	    <value id="GTK_BUTTONBOX_EDGE" _name="Edge"></value>
+	    <value id="GTK_BUTTONBOX_START" _name="Start"></value>
+	    <value id="GTK_BUTTONBOX_END" _name="End"></value>
+	    <value id="GTK_BUTTONBOX_CENTER" _name="Center"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -1674,65 +1642,65 @@ embedded in another object</_tooltip>
     
     <glade-widget-class name="GtkHButtonBox" generic-name="hbuttonbox" _title="Horizontal Button Box">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
     <glade-widget-class name="GtkVButtonBox" generic-name="vbuttonbox" _title="Vertical Button Box">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkSeparator" generic-name="separator" _title="Separator">
       <packing-defaults>
 	<parent-class name="GtkBox">
-	  <child-property id="expand" default="false"/>
+	  <child-property id="expand" default="false"></child-property>
 	</parent-class>
       </packing-defaults>
     </glade-widget-class>
     <glade-widget-class name="GtkHSeparator" generic-name="hseparator" _title="Horizontal Separator">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
       <packing-defaults>
 	<parent-class name="GtkVBox">
-	  <child-property id="expand" default="false"/>
+	  <child-property id="expand" default="false"></child-property>
 	</parent-class>
       </packing-defaults>
     </glade-widget-class>
     <glade-widget-class name="GtkVSeparator" generic-name="vseparator" _title="Vertical Separator">
       <properties>
-	<property id="orientation" disabled="True"/>
+	<property id="orientation" disabled="True"></property>
       </properties>
       <packing-defaults>
 	<parent-class name="GtkHBox">
-	  <child-property id="expand" default="false"/>
+	  <child-property id="expand" default="false"></child-property>
 	</parent-class>
       </packing-defaults>
     </glade-widget-class>
 
     <glade-widget-class name="GtkStatusbar" generic-name="statusbar" _title="Status Bar">
       <properties>
-	<property id="size" disabled="True" />
+	<property id="size" disabled="True"></property>
       </properties>
       <packing-defaults>
 	<parent-class name="GtkVBox">
-	  <child-property id="expand" default="false"/>
+	  <child-property id="expand" default="false"></child-property>
 	</parent-class>
       </packing-defaults>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkAccelLabel" generic-name="accellabel" _title="Accel Label"/>
+    <glade-widget-class name="GtkAccelLabel" generic-name="accellabel" _title="Accel Label"></glade-widget-class>
 
     <glade-widget-class name="GtkArrow" generic-name="arrow" _title="Arrow">
       <properties>
       	<property id="arrow-type">
   	  <displayable-values>
-	    <value id="GTK_ARROW_UP" _name="Up"/>
-	    <value id="GTK_ARROW_DOWN" _name="Down"/>
-	    <value id="GTK_ARROW_LEFT" _name="Left"/>
-	    <value id="GTK_ARROW_RIGHT" _name="Right"/>
-	    <value id="GTK_ARROW_NONE" _name="None"/>
+	    <value id="GTK_ARROW_UP" _name="Up"></value>
+	    <value id="GTK_ARROW_DOWN" _name="Down"></value>
+	    <value id="GTK_ARROW_LEFT" _name="Left"></value>
+	    <value id="GTK_ARROW_RIGHT" _name="Right"></value>
+	    <value id="GTK_ARROW_NONE" _name="None"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -1752,9 +1720,30 @@ embedded in another object</_tooltip>
       <remove-child-function>glade_gtk_fixed_layout_remove_child</remove-child-function> 
     </glade-widget-class>
     
-    <glade-widget-class name="GtkDrawingArea" generic-name="drawingarea" _title="Drawing Area"/>
+    <glade-widget-class name="GtkDrawingArea" generic-name="drawingarea" _title="Drawing Area"></glade-widget-class>
+    
+    <glade-widget-class name="GtkInfoBar" generic-name="infobar" _title="Info Bar">
+      <read-child-function>glade_gtk_info_bar_read_child</read-child-function>
+      <write-child-function>glade_gtk_info_bar_write_child</write-child-function>
+      <internal-children>
+        <object name="action_area"></object>
+        <object name="content_area"></object>
+      </internal-children>
+      <properties>
+	<property id="message-type">
+  	  <displayable-values>
+	    <value id="GTK_MESSAGE_INFO" _name="Info"></value>
+	    <value id="GTK_MESSAGE_WARNING" _name="Warning"></value>
+	    <value id="GTK_MESSAGE_QUESTION" _name="Question"></value>
+	    <value id="GTK_MESSAGE_ERROR" _name="Error"></value>
+	    <value id="GTK_MESSAGE_OTHER" _name="Other"></value>
+	  </displayable-values>
+	</property>
+        <property id="size" query="True" ignore="True" disabled="True"></property>
+      </properties>
+    </glade-widget-class>
 
-    <glade-widget-class name="GtkEventBox" generic-name="eventbox" _title="Event Box"/>
+    <glade-widget-class name="GtkEventBox" generic-name="eventbox" _title="Event Box"></glade-widget-class>
 
     <glade-widget-class name="GtkExpander" generic-name="expander" _title="Expander">
       <post-create-function>glade_gtk_expander_post_create</post-create-function>
@@ -1765,12 +1754,11 @@ embedded in another object</_tooltip>
       <special-child-type>type</special-child-type>
 
       <properties>
-	<property id="label" disabled="True"/>
-	<property id="label-widget" disabled="True"/>
+	<property id="label" disabled="True"></property>
+	<property id="label-widget" disabled="True"></property>
 
 	<!-- Atk activate property -->
-	<property id="atk-activate" _name="Activate" ignore="True" atk-property="True" save="False" 
-		  multiline="True">
+	<property id="atk-activate" _name="Activate" ignore="True" atk-property="True" save="False" multiline="True">
 	  <parameter-spec>
 	    <type>GParamString</type>
 	  </parameter-spec>
@@ -1779,28 +1767,28 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
     
-    <glade-widget-class name="GtkViewport" generic-name="viewport" _title="Viewport"/>
+    <glade-widget-class name="GtkViewport" generic-name="viewport" _title="Viewport"></glade-widget-class>
     
     <glade-widget-class name="GtkScrolledWindow" generic-name="scrolledwindow" _title="Scrolled Window">
       <properties>
-        <property id="shadow-type" default="GTK_SHADOW_IN"/>
-        <property id="min-content-width" since="3.0"/>
-        <property id="min-content-height" since="3.0"/>
-        <property id="window-placement-set" since="2.10" ignore="True"/>
+        <property id="shadow-type" default="GTK_SHADOW_IN"></property>
+        <property id="min-content-width" since="3.0"></property>
+        <property id="min-content-height" since="3.0"></property>
+        <property id="window-placement-set" since="2.10" ignore="True"></property>
       	<property id="hscrollbar-policy" default="GTK_POLICY_AUTOMATIC">
   	  <displayable-values>
-	    <value id="GTK_POLICY_ALWAYS" _name="Always"/>
-	    <value id="GTK_POLICY_AUTOMATIC" _name="Automatic"/>
-	    <value id="GTK_POLICY_NEVER" _name="Never"/>
+	    <value id="GTK_POLICY_ALWAYS" _name="Always"></value>
+	    <value id="GTK_POLICY_AUTOMATIC" _name="Automatic"></value>
+	    <value id="GTK_POLICY_NEVER" _name="Never"></value>
 	  </displayable-values>
 	</property>
-      	<property id="vscrollbar-policy" default="GTK_POLICY_AUTOMATIC"/>
+      	<property id="vscrollbar-policy" default="GTK_POLICY_AUTOMATIC"></property>
       	<property id="window-placement">
   	  <displayable-values>
-	    <value id="GTK_CORNER_TOP_LEFT" _name="Top Left"/>
-	    <value id="GTK_CORNER_BOTTOM_LEFT" _name="Bottom Left"/>
-	    <value id="GTK_CORNER_TOP_RIGHT" _name="Top Right"/>
-	    <value id="GTK_CORNER_BOTTOM_RIGHT" _name="Bottom Right"/>
+	    <value id="GTK_CORNER_TOP_LEFT" _name="Top Left"></value>
+	    <value id="GTK_CORNER_BOTTOM_LEFT" _name="Bottom Left"></value>
+	    <value id="GTK_CORNER_TOP_RIGHT" _name="Top Right"></value>
+	    <value id="GTK_CORNER_BOTTOM_RIGHT" _name="Bottom Right"></value>
 	  </displayable-values>
 	</property>
       </properties> 
@@ -1813,23 +1801,23 @@ embedded in another object</_tooltip>
     
    <glade-widget-class name="GtkAboutDialog" generic-name="aboutdialog" _title="About Dialog">
       <properties>
-	<property id="program-name" since="2.12"/>
-	<property id="copyright" translatable="True" multiline="True"/>
-	<property id="comments" translatable="True" multiline="True"/>
-	<property id="license" translatable="True" multiline="True"/>
-	<property id="website-label" translatable="True" multiline="True"/>
+	<property id="program-name" since="2.12"></property>
+	<property id="copyright" translatable="True" multiline="True"></property>
+	<property id="comments" translatable="True" multiline="True"></property>
+	<property id="license" translatable="True" multiline="True"></property>
+	<property id="website-label" translatable="True" multiline="True"></property>
 
        	<property id="license-type" since="3.0">
   	  <displayable-values>
-	    <value id="GTK_LICENSE_UNKNOWN" _name="Unknown"/>
-	    <value id="GTK_LICENSE_CUSTOM" _name="Custom"/>
-	    <value id="GTK_LICENSE_GPL_2_0" _name="GPL 2.0"/>
-	    <value id="GTK_LICENSE_GPL_3_0" _name="GPL 3.0"/>
-	    <value id="GTK_LICENSE_LGPL_2_1" _name="LGPL 2.1"/>
-	    <value id="GTK_LICENSE_LGPL_3_0" _name="LGPL 3.0"/>
-	    <value id="GTK_LICENSE_BSD" _name="BSD"/>
-	    <value id="GTK_LICENSE_MIT_X11" _name="MIT X11"/>
-	    <value id="GTK_LICENSE_ARTISTIC" _name="Artistic"/>
+	    <value id="GTK_LICENSE_UNKNOWN" _name="Unknown"></value>
+	    <value id="GTK_LICENSE_CUSTOM" _name="Custom"></value>
+	    <value id="GTK_LICENSE_GPL_2_0" _name="GPL 2.0"></value>
+	    <value id="GTK_LICENSE_GPL_3_0" _name="GPL 3.0"></value>
+	    <value id="GTK_LICENSE_LGPL_2_1" _name="LGPL 2.1"></value>
+	    <value id="GTK_LICENSE_LGPL_3_0" _name="LGPL 3.0"></value>
+	    <value id="GTK_LICENSE_BSD" _name="BSD"></value>
+	    <value id="GTK_LICENSE_MIT_X11" _name="MIT X11"></value>
+	    <value id="GTK_LICENSE_ARTISTIC" _name="Artistic"></value>
 	  </displayable-values>
 	</property>
 	
@@ -1839,37 +1827,64 @@ embedded in another object</_tooltip>
 	</property>
       </properties>
       <signals>
-	<signal id="activate-link" since="2.24"/>
+	<signal id="activate-link" since="2.24"></signal>
       </signals>
    </glade-widget-class>
 
     <glade-widget-class name="GtkColorSelectionDialog" generic-name="colorselectiondialog" _title="Color Selection Dialog">
+      <internal-children>
+        <object name="vbox">
+          <internal-children>
+            <object name="color_selection"></object>
+            <object name="action_area">
+              <internal-children>
+                <object name="ok_button"></object>
+                <object name="cancel_button"></object>
+                <object name="help_button"></object>
+              </internal-children>
+            </object>
+          </internal-children>
+        </object>
+      </internal-children>
       <properties>
-        <property id="has-separator"  disabled="True"/>
+        <property id="has-separator" disabled="True"></property>
       </properties>
     </glade-widget-class>
 
     <glade-widget-class name="GtkFileChooserDialog" generic-name="filechooserdialog" _title="File Chooser Dialog">
       <properties>
-	<property id="extra-widget" parentless-widget="True" />
-	<property id="preview-widget" parentless-widget="True" />
-	<property id="filter"/>
-	<property id="create-folders" since="2.18"/>
+	<property id="extra-widget" parentless-widget="True"></property>
+	<property id="preview-widget" parentless-widget="True"></property>
+	<property id="filter"></property>
+	<property id="create-folders" since="2.18"></property>
       </properties>
 
       <signals>
-	<signal id="file-set" since="2.12"/>
+	<signal id="file-set" since="2.12"></signal>
       </signals>
     </glade-widget-class>
     
     <glade-widget-class name="GtkFontSelectionDialog" generic-name="fontselectiondialog" _title="Font Selection Dialog">
-      <properties>
-        <property id="has-separator"  disabled="True"/>
+      <internal-children>
+        <object name="vbox">
+          <internal-children>
+            <object name="font_selection"></object>
+            <object name="action_area">
+              <internal-children>
+                <object name="ok_button"></object>
+                <object name="cancel_button"></object>
+                <object name="apply_button"></object>
+              </internal-children>
+            </object>
+          </internal-children>
+        </object>
+      </internal-children>
+      <properties>
+        <property id="has-separator" disabled="True"></property>
       </properties>
     </glade-widget-class>
     
-    <glade-widget-class name="GtkAppChooserDialog" generic-name="appchooserdialog" 
-			_title="Application Chooser Dialog" since="3.0">
+    <glade-widget-class name="GtkAppChooserDialog" generic-name="appchooserdialog" _title="Application Chooser Dialog" since="3.0">
     </glade-widget-class>
 
     <glade-widget-class name="GtkMessageDialog" generic-name="messagedialog" _title="Message Dialog" default-width="400" default-height="115">
@@ -1878,36 +1893,27 @@ embedded in another object</_tooltip>
       <verify-function>glade_gtk_message_dialog_verify_property</verify-function>
 
       <properties>
-        <property id="has-separator"  disabled="True"/>
+        <property id="has-separator" disabled="True"></property>
 
-	<property id="default-width"  default="400" optional="True" optional-default="False"/>
-	<property id="default-height" default="115" optional="True" optional-default="False"/>
+	<property id="default-width" default="400" optional="True" optional-default="False"></property>
+	<property id="default-height" default="115" optional="True" optional-default="False"></property>
 
-	<property common="True" id="sensitive"/>
+	<property common="True" id="sensitive"></property>
 
-	<property id="image" since="2.10" parentless-widget="True"/>
-	<property id="secondary-text" translatable="True" since="2.10"/>
-	<property id="secondary-use-markup" since="2.10"/>
-	<property id="text" translatable="True" since="2.10"/>
-	<property id="use-markup" since="2.10"/>
+	<property id="image" since="2.10" parentless-widget="True"></property>
+	<property id="secondary-text" translatable="True" since="2.10"></property>
+	<property id="secondary-use-markup" since="2.10"></property>
+	<property id="text" translatable="True" since="2.10"></property>
+	<property id="use-markup" since="2.10"></property>
 
-	<property id="message-type">
-  	  <displayable-values>
-	    <value id="GTK_MESSAGE_INFO" _name="Info"/>
-	    <value id="GTK_MESSAGE_WARNING" _name="Warning"/>
-	    <value id="GTK_MESSAGE_QUESTION" _name="Question"/>
-	    <value id="GTK_MESSAGE_ERROR" _name="Error"/>
-	    <value id="GTK_MESSAGE_OTHER" _name="Other"/>
-	  </displayable-values>
-	</property>
 	<property id="buttons">
   	  <displayable-values>
-	    <value id="GTK_BUTTONS_NONE" _name="None"/>
-	    <value id="GTK_BUTTONS_OK" _name="Ok"/>
-	    <value id="GTK_BUTTONS_CLOSE" _name="Close"/>
-	    <value id="GTK_BUTTONS_CANCEL" _name="Cancel"/>
-	    <value id="GTK_BUTTONS_YES_NO" _name="Yes, No"/>
-	    <value id="GTK_BUTTONS_OK_CANCEL" _name="Ok, Cancel"/>
+	    <value id="GTK_BUTTONS_NONE" _name="None"></value>
+	    <value id="GTK_BUTTONS_OK" _name="Ok"></value>
+	    <value id="GTK_BUTTONS_CLOSE" _name="Close"></value>
+	    <value id="GTK_BUTTONS_CANCEL" _name="Cancel"></value>
+	    <value id="GTK_BUTTONS_YES_NO" _name="Yes, No"></value>
+	    <value id="GTK_BUTTONS_OK_CANCEL" _name="Ok, Cancel"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -1915,13 +1921,13 @@ embedded in another object</_tooltip>
 
     <glade-widget-class name="GtkColorSelection" generic-name="colorselection" _title="Color Selection">
       <properties>
-	<property id="current-color" default="Black" optional="True" optional-default="False"/>
-	<property id="current-alpha" optional="True" optional-default="False"/>
-	<property id="current-rgba" default="Black" optional="True" optional-default="False" since="3.0"/>
+	<property id="current-color" default="Black" optional="True" optional-default="False"></property>
+	<property id="current-alpha" optional="True" optional-default="False"></property>
+	<property id="current-rgba" default="Black" optional="True" optional-default="False" since="3.0"></property>
       </properties>
     </glade-widget-class>
     
-    <glade-widget-class name="GtkFontSelection" generic-name="fontselection" _title="Font Selection"/>
+    <glade-widget-class name="GtkFontSelection" generic-name="fontselection" _title="Font Selection"></glade-widget-class>
     
     <glade-widget-class name="GtkAssistant" generic-name="assistant" _title="Assistant" since="2.10">
       <post-create-function>glade_gtk_assistant_post_create</post-create-function>
@@ -1943,20 +1949,20 @@ embedded in another object</_tooltip>
 	</property>
       </properties>
       <packing-properties>
-	<property id="title" translatable="True" since="2.10"/>
-	<property id="header-image" since="2.10"/>
-	<property id="sidebar-image" since="2.10"/>
+	<property id="title" translatable="True" since="2.10"></property>
+	<property id="header-image" since="2.10"></property>
+	<property id="sidebar-image" since="2.10"></property>
         <property id="complete" ignore="True" _name="Initially Complete">
 	  <_tooltip>Whether this page will initially be marked as complete regardless of user input.</_tooltip>
 	</property>
 	<property id="page-type" ignore="True">
   	  <displayable-values>
-	    <value id="GTK_ASSISTANT_PAGE_CONTENT" _name="Content"/>
-	    <value id="GTK_ASSISTANT_PAGE_INTRO" _name="Intro"/>
-	    <value id="GTK_ASSISTANT_PAGE_CONFIRM" _name="Confirm"/>
-	    <value id="GTK_ASSISTANT_PAGE_SUMMARY" _name="Summary"/>
-	    <value id="GTK_ASSISTANT_PAGE_PROGRESS" _name="Progress"/>
-	    <value id="GTK_ASSISTANT_PAGE_CUSTOM" _name="Custom"/>
+	    <value id="GTK_ASSISTANT_PAGE_CONTENT" _name="Content"></value>
+	    <value id="GTK_ASSISTANT_PAGE_INTRO" _name="Intro"></value>
+	    <value id="GTK_ASSISTANT_PAGE_CONFIRM" _name="Confirm"></value>
+	    <value id="GTK_ASSISTANT_PAGE_SUMMARY" _name="Summary"></value>
+	    <value id="GTK_ASSISTANT_PAGE_PROGRESS" _name="Progress"></value>
+	    <value id="GTK_ASSISTANT_PAGE_CUSTOM" _name="Custom"></value>
 	  </displayable-values>
 	</property>
         <property save="False" id="position" _name="Position">
@@ -1972,40 +1978,40 @@ embedded in another object</_tooltip>
       <properties>
         <!-- The pspec of this prop says that the default is http://www.gtk.org but gtk_link_button_init() does
 	     not set it up... do we need to override it to avoid seting a NULL value ? -->
-        <property id="uri" default="http://glade.gnome.org"; since="2.10"/>
-        <property id="visited" since="2.14"/>
+        <property id="uri" default="http://glade.gnome.org"; since="2.10"></property>
+        <property id="visited" since="2.14"></property>
       </properties>
    </glade-widget-class>
 
     <glade-widget-class name="GtkRecentChooserWidget" generic-name="recentchooser" _title="Recent Chooser">
 
       <signals>
-	<signal id="item-activated" since="2.10"/>
-	<signal id="selection-changed" since="2.10"/>
+	<signal id="item-activated" since="2.10"></signal>
+	<signal id="selection-changed" since="2.10"></signal>
       </signals>
 
       <properties>
-	<property id="size" disabled="True"/>
-	<property id="filter" since="2.10"/>
-	<property id="limit" since="2.10"/>
-	<property id="local-only" since="2.10"/>
-	<property id="recent-manager" since="2.10"/>
-	<property id="select-multiple" since="2.10"/>
-	<property id="show-icons" since="2.10"/>
-	<property id="show-not-found" since="2.10"/>
-	<property id="show-tips" since="2.10"/>
+	<property id="size" disabled="True"></property>
+	<property id="filter" since="2.10"></property>
+	<property id="limit" since="2.10"></property>
+	<property id="local-only" since="2.10"></property>
+	<property id="recent-manager" since="2.10"></property>
+	<property id="select-multiple" since="2.10"></property>
+	<property id="show-icons" since="2.10"></property>
+	<property id="show-not-found" since="2.10"></property>
+	<property id="show-tips" since="2.10"></property>
         <property id="sort-type" since="2.10">
   	  <displayable-values>
-	    <value id="GTK_RECENT_SORT_NONE" _name="None"/>
-	    <value id="GTK_RECENT_SORT_MRU" _name="Most Recently Used first"/>
-	    <value id="GTK_RECENT_SORT_LRU" _name="Least Recently Used first"/>
-	    <value id="GTK_RECENT_SORT_CUSTOM" _name="Custom"/>
+	    <value id="GTK_RECENT_SORT_NONE" _name="None"></value>
+	    <value id="GTK_RECENT_SORT_MRU" _name="Most Recently Used first"></value>
+	    <value id="GTK_RECENT_SORT_LRU" _name="Least Recently Used first"></value>
+	    <value id="GTK_RECENT_SORT_CUSTOM" _name="Custom"></value>
 	  </displayable-values>
 	</property>
       </properties>
     </glade-widget-class>
     
-    <glade-widget-class name="GtkRecentChooserDialog" generic-name="recentchooserdialog" _title="Recent Chooser Dialog"/>
+    <glade-widget-class name="GtkRecentChooserDialog" generic-name="recentchooserdialog" _title="Recent Chooser Dialog"></glade-widget-class>
     
     <glade-widget-class name="GtkSizeGroup" generic-name="sizegroup" _title="Size Group" toplevel="True">
       <depends-function>glade_gtk_size_group_depends</depends-function>
@@ -2022,29 +2028,26 @@ embedded in another object</_tooltip>
 	</property>
 	<property id="mode">
   	  <displayable-values>
-	    <value id="GTK_SIZE_GROUP_NONE" _name="None"/>
-	    <value id="GTK_SIZE_GROUP_HORIZONTAL" _name="Horizontal"/>
-	    <value id="GTK_SIZE_GROUP_VERTICAL" _name="Vertical"/>
-	    <value id="GTK_SIZE_GROUP_BOTH" _name="Both"/>
+	    <value id="GTK_SIZE_GROUP_NONE" _name="None"></value>
+	    <value id="GTK_SIZE_GROUP_HORIZONTAL" _name="Horizontal"></value>
+	    <value id="GTK_SIZE_GROUP_VERTICAL" _name="Vertical"></value>
+	    <value id="GTK_SIZE_GROUP_BOTH" _name="Both"></value>
 	  </displayable-values>
 	</property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkWindowGroup" generic-name="windowgroup" 
-			_title="Window Group" toplevel="True"/>
-    <glade-widget-class name="GtkAccelGroup" generic-name="accelgroup" 
-			_title="Accel Group" toplevel="True"/>
-    <glade-widget-class name="GtkAdjustment" generic-name="adjustment" 
-			_title="Adjustment" toplevel="True">
+    <glade-widget-class name="GtkWindowGroup" generic-name="windowgroup" _title="Window Group" toplevel="True"></glade-widget-class>
+    <glade-widget-class name="GtkAccelGroup" generic-name="accelgroup" _title="Accel Group" toplevel="True"></glade-widget-class>
+    <glade-widget-class name="GtkAdjustment" generic-name="adjustment" _title="Adjustment" toplevel="True">
       <write-widget-function>glade_gtk_adjustment_write_widget</write-widget-function>
       <properties>
-	<property id="value" default="0.0" save="False"/>
-	<property id="lower" default="0.0" save="False"/>
-	<property id="upper" default="100.0" save="False"/>
-	<property id="page-increment" default="10.0"/>
-	<property id="step-increment" default="1.0"/>
-	<property id="page-size" default="0.0"/>
+	<property id="value" default="0.0" save="False"></property>
+	<property id="lower" default="0.0" save="False"></property>
+	<property id="upper" default="100.0" save="False"></property>
+	<property id="page-increment" default="10.0"></property>
+	<property id="step-increment" default="1.0"></property>
+	<property id="page-size" default="0.0"></property>
       </properties>
     </glade-widget-class>
 
@@ -2054,23 +2057,22 @@ embedded in another object</_tooltip>
       <string-from-value-function>glade_gtk_widget_string_from_value</string-from-value-function>
       <action-activate-function>glade_gtk_action_action_activate</action-activate-function>
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
 
       <properties>
-	<property id="name" disabled="True"/>
-	<property id="label" translatable="True"/>
-	<property id="short-label" translatable="True"/>
-	<property id="tooltip" translatable="True"/>
-	<property id="stock-id" stock-icon="True"/>
-	<property id="icon-name" themed-icon="True" since="2.10"/>
-	<property id="gicon" disabled="True" since="2.16"/>
-	<property id="action-group" disabled="True"/>
-	<property id="always-show-image" since="2.20"/>
+	<property id="name" disabled="True"></property>
+	<property id="label" translatable="True"></property>
+	<property id="short-label" translatable="True"></property>
+	<property id="tooltip" translatable="True"></property>
+	<property id="stock-id" stock-icon="True"></property>
+	<property id="icon-name" themed-icon="True" since="2.10"></property>
+	<property id="gicon" disabled="True" since="2.16"></property>
+	<property id="action-group" disabled="True"></property>
+	<property id="always-show-image" since="2.20"></property>
 
 	<!-- Accelerator -->
-	<property id="accelerator" _name="Accelerator" ignore="True" 
-		  common="False" save="False" weight="2.0">
+	<property id="accelerator" _name="Accelerator" ignore="True" common="False" save="False" weight="2.0">
 	  <parameter-spec>
 	    <type>GParamBoxed</type>
 	    <value-type>GladeAccelGList</value-type>
@@ -2080,12 +2082,11 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkToggleAction" generic-name="toggleaction" _title="Toggle Action" />
-    <glade-widget-class name="GtkRadioAction" generic-name="radioaction" _title="Radio Action" />
-    <glade-widget-class name="GtkRecentAction" generic-name="recentaction" _title="Recent Action" since="2.12"/>
+    <glade-widget-class name="GtkToggleAction" generic-name="toggleaction" _title="Toggle Action"></glade-widget-class>
+    <glade-widget-class name="GtkRadioAction" generic-name="radioaction" _title="Radio Action"></glade-widget-class>
+    <glade-widget-class name="GtkRecentAction" generic-name="recentaction" _title="Recent Action" since="2.12"></glade-widget-class>
 
-    <glade-widget-class name="GtkActionGroup" generic-name="actiongroup" _title="Action Group" 
-			toplevel="True" use-placeholders="False">
+    <glade-widget-class name="GtkActionGroup" generic-name="actiongroup" _title="Action Group" toplevel="True" use-placeholders="False">
       <add-child-verify-function>glade_gtk_action_group_add_verify</add-child-verify-function>
       <add-child-function>glade_gtk_action_group_add_child</add-child-function>
       <remove-child-function>glade_gtk_action_group_remove_child</remove-child-function>
@@ -2095,15 +2096,13 @@ embedded in another object</_tooltip>
       <write-child-function>glade_gtk_action_group_write_child</write-child-function>
       <action-activate-function>glade_gtk_action_action_activate</action-activate-function>
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkEntryCompletion" generic-name="entrycompletion" _title="Entry Completion" 
-			toplevel="True"/>
+    <glade-widget-class name="GtkEntryCompletion" generic-name="entrycompletion" _title="Entry Completion" toplevel="True"></glade-widget-class>
 
-    <glade-widget-class name="GtkIconFactory" generic-name="iconfactory" _title="Icon Factory" 
-			toplevel="True">
+    <glade-widget-class name="GtkIconFactory" generic-name="iconfactory" _title="Icon Factory" toplevel="True">
       <post-create-function>glade_gtk_icon_factory_post_create</post-create-function>
       <read-widget-function>glade_gtk_icon_factory_read_widget</read-widget-function>
       <write-widget-function>glade_gtk_icon_factory_write_widget</write-widget-function>
@@ -2122,8 +2121,7 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkListStore" generic-name="liststore" _title="List Store" 
-			toplevel="True">
+    <glade-widget-class name="GtkListStore" generic-name="liststore" _title="List Store" toplevel="True">
       <post-create-function>glade_gtk_store_post_create</post-create-function>
       <set-property-function>glade_gtk_store_set_property</set-property-function>
       <create-editor-property-function>glade_gtk_store_create_eprop</create-editor-property-function>
@@ -2149,8 +2147,7 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkTreeStore" generic-name="treestore" _title="Tree Store" 
-			toplevel="True">
+    <glade-widget-class name="GtkTreeStore" generic-name="treestore" _title="Tree Store" toplevel="True">
       <set-property-function>glade_gtk_store_set_property</set-property-function>
       <create-editor-property-function>glade_gtk_store_create_eprop</create-editor-property-function>
       <create-editable-function>glade_gtk_store_create_editable</create-editable-function>
@@ -2175,20 +2172,16 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkTreeModelFilter" generic-name="treemodelfilter" _title="Tree Model Filter" 
-			toplevel="True"/>
-    <glade-widget-class name="GtkTreeModelSort" generic-name="treemodelsort" _title="Tree Model Sort" 
-			toplevel="True"/>
-    <glade-widget-class name="GtkTreeSelection" generic-name="treeselection" _title="Tree Selection"/>
+    <glade-widget-class name="GtkTreeModelFilter" generic-name="treemodelfilter" _title="Tree Model Filter" toplevel="True"></glade-widget-class>
+    <glade-widget-class name="GtkTreeModelSort" generic-name="treemodelsort" _title="Tree Model Sort" toplevel="True"></glade-widget-class>
+    <glade-widget-class name="GtkTreeSelection" generic-name="treeselection" _title="Tree Selection"></glade-widget-class>
 
 
     <glade-widget-class name="GtkTreeView" generic-name="treeview" _title="Tree View">
-      <post-create-function>glade_gtk_treeview_post_create</post-create-function>
       <add-child-verify-function>glade_gtk_treeview_add_verify</add-child-verify-function>
       <child-set-property-function>glade_gtk_treeview_set_child_property</child-set-property-function>
       <child-get-property-function>glade_gtk_treeview_get_child_property</child-get-property-function>
       <get-children-function>glade_gtk_treeview_get_children</get-children-function>
-      <get-internal-child-function>glade_gtk_treeview_get_internal_child</get-internal-child-function>
       <add-child-function>glade_gtk_treeview_add_child</add-child-function>
       <replace-child-function>glade_gtk_treeview_replace_child</replace-child-function>
       <remove-child-function>glade_gtk_treeview_remove_child</remove-child-function>
@@ -2196,21 +2189,25 @@ embedded in another object</_tooltip>
       <depends-function>glade_gtk_treeview_depends</depends-function>
 
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
+      
+      <internal-children>
+        <object name="selection"></object>
+      </internal-children>
 
       <properties>
-        <property id="level-indentation" since="2.12"/>
-        <property id="show-expanders" since="2.12"/>
+        <property id="level-indentation" since="2.12"></property>
+        <property id="show-expanders" since="2.12"></property>
         <property id="enable-grid-lines" ignore="True">
   	  <displayable-values>
-	    <value id="GTK_TREE_VIEW_GRID_LINES_NONE" _name="None"/>
-	    <value id="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" _name="Horizontal"/>
-	    <value id="GTK_TREE_VIEW_GRID_LINES_VERTICAL" _name="Vertical"/>
-	    <value id="GTK_TREE_VIEW_GRID_LINES_BOTH" _name="Horizontal and Vertical"/>
+	    <value id="GTK_TREE_VIEW_GRID_LINES_NONE" _name="None"></value>
+	    <value id="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" _name="Horizontal"></value>
+	    <value id="GTK_TREE_VIEW_GRID_LINES_VERTICAL" _name="Vertical"></value>
+	    <value id="GTK_TREE_VIEW_GRID_LINES_BOTH" _name="Horizontal and Vertical"></value>
 	  </displayable-values>
 	</property>
-        <property id="model" create-type="GtkListStore" query="True" />
+        <property id="model" create-type="GtkListStore" query="True"></property>
       </properties>
       
       <packing-properties>
@@ -2234,23 +2231,23 @@ embedded in another object</_tooltip>
       <child-get-property-function>glade_gtk_cell_layout_get_child_property</child-get-property-function>
       
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
 
       <properties>
-        <property id="sort-column-id" since="2.18"/>
+        <property id="sort-column-id" since="2.18"></property>
         <property id="sort-order">
   	  <displayable-values>
-	    <value id="GTK_SORT_ASCENDING" _name="Ascending"/>
-	    <value id="GTK_SORT_DESCENDING" _name="Descending"/>
+	    <value id="GTK_SORT_ASCENDING" _name="Ascending"></value>
+	    <value id="GTK_SORT_DESCENDING" _name="Descending"></value>
 	  </displayable-values>
 	</property>
-        <property id="title" default="column" translatable="True"/>
+        <property id="title" default="column" translatable="True"></property>
         <property id="sizing">
   	  <displayable-values>
-	    <value id="GTK_TREE_VIEW_COLUMN_GROW_ONLY" _name="Grow Only"/>
-	    <value id="GTK_TREE_VIEW_COLUMN_AUTOSIZE" _name="Automatic"/>
-	    <value id="GTK_TREE_VIEW_COLUMN_FIXED" _name="Fixed"/>
+	    <value id="GTK_TREE_VIEW_COLUMN_GROW_ONLY" _name="Grow Only"></value>
+	    <value id="GTK_TREE_VIEW_COLUMN_AUTOSIZE" _name="Automatic"></value>
+	    <value id="GTK_TREE_VIEW_COLUMN_FIXED" _name="Fixed"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -2277,23 +2274,23 @@ embedded in another object</_tooltip>
       <child-get-property-function>glade_gtk_cell_layout_get_child_property</child-get-property-function>
       
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
 
       <properties>
-        <property id="item-orientation" since="2.22"/>
-        <property id="item-padding" since="2.18"/>
-        <property id="text-column" disabled="True"/>
-        <property id="markup-column" disabled="True"/>
-        <property id="pixbuf-column" disabled="True"/>
-        <property id="reorderable" ignore="True"/>
-        <property id="model" create-type="GtkListStore" query="True" />
+        <property id="item-orientation" since="2.22"></property>
+        <property id="item-padding" since="2.18"></property>
+        <property id="text-column" disabled="True"></property>
+        <property id="markup-column" disabled="True"></property>
+        <property id="pixbuf-column" disabled="True"></property>
+        <property id="reorderable" ignore="True"></property>
+        <property id="model" create-type="GtkListStore" query="True"></property>
         <property id="selection-mode" since="2.6">
   	  <displayable-values>
-	    <value id="GTK_SELECTION_NONE" _name="None"/>
-	    <value id="GTK_SELECTION_SINGLE" _name="Single"/>
-	    <value id="GTK_SELECTION_BROWSE" _name="Browse"/>
-	    <value id="GTK_SELECTION_MULTIPLE" _name="Multiple"/>
+	    <value id="GTK_SELECTION_NONE" _name="None"></value>
+	    <value id="GTK_SELECTION_SINGLE" _name="Single"></value>
+	    <value id="GTK_SELECTION_BROWSE" _name="Browse"></value>
+	    <value id="GTK_SELECTION_MULTIPLE" _name="Multiple"></value>
 	  </displayable-values>
 	</property>
       </properties>
@@ -2317,17 +2314,17 @@ embedded in another object</_tooltip>
       <action-activate-function>glade_gtk_cell_renderer_action_activate</action-activate-function>
 
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
 
       <properties>
-        <property id="cell-background-set" disabled="True"/>
-        <property id="is-expanded" disabled="True"/>
-        <property id="is-expander" disabled="True"/>
-        <property id="mode" disabled="True"/>
+        <property id="cell-background-set" disabled="True"></property>
+        <property id="is-expanded" disabled="True"></property>
+        <property id="is-expander" disabled="True"></property>
+        <property id="mode" disabled="True"></property>
 
 	<!-- Cell renderer properties with thier virtual attribute and control properties -->
-        <property id="cell-background" common="True" save="False" custom-layout="True"/>
+        <property id="cell-background" common="True" save="False" custom-layout="True"></property>
         <property id="attr-cell-background" _name="Cell Background Color name column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2341,7 +2338,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="cell-background-gdk" common="True" save="False" custom-layout="True"/>
+        <property id="cell-background-gdk" common="True" save="False" custom-layout="True"></property>
         <property id="attr-cell-background-gdk" _name="Cell Background Color column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2355,9 +2352,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="cell-background-rgba" common="True" save="False" custom-layout="True" since="3.0"/>
-        <property id="attr-cell-background-rgba" _name="Cell Background RGBA column" save="False" 
-		  default="-1" custom-layout="True" since="3.0">
+        <property id="cell-background-rgba" common="True" save="False" custom-layout="True" since="3.0"></property>
+        <property id="attr-cell-background-rgba" _name="Cell Background RGBA column" save="False" default="-1" custom-layout="True" since="3.0">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -2370,7 +2366,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="width" common="True" save="False" custom-layout="True"/>
+        <property id="width" common="True" save="False" custom-layout="True"></property>
         <property id="attr-width" _name="Width column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2384,7 +2380,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="height" common="True" save="False" custom-layout="True"/>
+        <property id="height" common="True" save="False" custom-layout="True"></property>
         <property id="attr-height" _name="Height column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2398,7 +2394,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="xpad" _name="Horizontal Padding" common="True" save="False" custom-layout="True"/>
+        <property id="xpad" _name="Horizontal Padding" common="True" save="False" custom-layout="True"></property>
         <property id="attr-xpad" _name="Horizontal Padding column" save="False" default="-1" custom-layout="True">	
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2412,7 +2408,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="ypad" _name="Vertical Padding" common="True" save="False" custom-layout="True"/>
+        <property id="ypad" _name="Vertical Padding" common="True" save="False" custom-layout="True"></property>
         <property id="attr-ypad" _name="Vertical Padding column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2426,7 +2422,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="xalign" _name="Horizontal Alignment" common="True" save="False" custom-layout="True"/>
+        <property id="xalign" _name="Horizontal Alignment" common="True" save="False" custom-layout="True"></property>
         <property id="attr-xalign" _name="Horizontal Alignment column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2440,7 +2436,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="yalign" _name="Vertical Alignment" common="True" save="False" custom-layout="True"/>
+        <property id="yalign" _name="Vertical Alignment" common="True" save="False" custom-layout="True"></property>
         <property id="attr-yalign" _name="Vertical Alignment column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2454,7 +2450,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="sensitive" common="True" save="False" custom-layout="True"/>
+        <property id="sensitive" common="True" save="False" custom-layout="True"></property>
         <property id="attr-sensitive" _name="Sensitive column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2468,7 +2464,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="visible" _name="Visible" common="True" save="False" custom-layout="True"/>
+        <property id="visible" _name="Visible" common="True" save="False" custom-layout="True"></property>
         <property id="attr-visible" _name="Visible column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2484,30 +2480,30 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkCellRendererText" generic-name="cellrenderertext" _title="Text Renderer" >
+    <glade-widget-class name="GtkCellRendererText" generic-name="cellrenderertext" _title="Text Renderer">
       <properties>
-        <property id="editable-set" disabled="True"/>
-	<property id="ellipsize-set" disabled="True"/>
-	<property id="family-set" disabled="True"/>
-	<property id="align-set" disabled="True"/>
-	<property id="background-set" disabled="True"/>
-	<property id="foreground-set" disabled="True"/>
-	<property id="language-set" disabled="True"/>
-	<property id="rise-set" disabled="True"/>
-	<property id="scale-set" disabled="True"/>
-	<property id="size-set" disabled="True"/>
-	<property id="weight-set" disabled="True"/>
-	<property id="variant-set" disabled="True"/>
-	<property id="underline-set" disabled="True"/>
-	<property id="style-set" disabled="True"/>
-	<property id="strikethrough-set" disabled="True"/>
-	<property id="stretch-set" disabled="True"/>
+        <property id="editable-set" disabled="True"></property>
+	<property id="ellipsize-set" disabled="True"></property>
+	<property id="family-set" disabled="True"></property>
+	<property id="align-set" disabled="True"></property>
+	<property id="background-set" disabled="True"></property>
+	<property id="foreground-set" disabled="True"></property>
+	<property id="language-set" disabled="True"></property>
+	<property id="rise-set" disabled="True"></property>
+	<property id="scale-set" disabled="True"></property>
+	<property id="size-set" disabled="True"></property>
+	<property id="weight-set" disabled="True"></property>
+	<property id="variant-set" disabled="True"></property>
+	<property id="underline-set" disabled="True"></property>
+	<property id="style-set" disabled="True"></property>
+	<property id="strikethrough-set" disabled="True"></property>
+	<property id="stretch-set" disabled="True"></property>
 
         <property id="alignment" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="PANGO_ALIGN_LEFT" _name="Left"/>
-	    <value id="PANGO_ALIGN_CENTER" _name="Center"/>
-	    <value id="PANGO_ALIGN_RIGHT" _name="Right"/>
+	    <value id="PANGO_ALIGN_LEFT" _name="Left"></value>
+	    <value id="PANGO_ALIGN_CENTER" _name="Center"></value>
+	    <value id="PANGO_ALIGN_RIGHT" _name="Right"></value>
 	  </displayable-values>
 	</property>
         <property id="attr-alignment" _name="Alignment column" save="False" default="-1" custom-layout="True">
@@ -2523,7 +2519,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="attributes" save="False" custom-layout="True"/>
+        <property id="attributes" save="False" custom-layout="True"></property>
         <property id="attr-attributes" _name="Attributes column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2538,7 +2534,7 @@ embedded in another object</_tooltip>
 	</property>
 
 
-        <property id="background" save="False" custom-layout="True"/>
+        <property id="background" save="False" custom-layout="True"></property>
         <property id="attr-background" _name="Background Color Name column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2552,7 +2548,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="background-gdk" save="False" custom-layout="True"/>
+        <property id="background-gdk" save="False" custom-layout="True"></property>
         <property id="attr-background-gdk" _name="Background Color column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2566,7 +2562,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="editable" save="False" custom-layout="True"/>
+        <property id="editable" save="False" custom-layout="True"></property>
         <property id="attr-editable" _name="Editable column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2580,7 +2576,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="ellipsize" save="False" custom-layout="True"/>
+        <property id="ellipsize" save="False" custom-layout="True"></property>
         <property id="attr-ellipsize" _name="Ellipsize column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2594,7 +2590,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="family" save="False" custom-layout="True"/>
+        <property id="family" save="False" custom-layout="True"></property>
         <property id="attr-family" _name="Family column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2608,7 +2604,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="font" save="False" custom-layout="True"/>
+        <property id="font" save="False" custom-layout="True"></property>
         <property id="attr-font" _name="Font column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2622,9 +2618,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="font-desc" save="False" custom-layout="True"/>
-        <property id="attr-font-desc" _name="Font Description column" save="False" 
-		  default="-1" custom-layout="True">
+        <property id="font-desc" save="False" custom-layout="True"></property>
+        <property id="attr-font-desc" _name="Font Description column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -2637,9 +2632,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="foreground" save="False" custom-layout="True"/>
-        <property id="attr-foreground" _name="Foreground Color Name column" save="False" 
-		  default="-1" custom-layout="True">
+        <property id="foreground" save="False" custom-layout="True"></property>
+        <property id="attr-foreground" _name="Foreground Color Name column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -2652,9 +2646,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="foreground-gdk" save="False" custom-layout="True"/>
-        <property id="attr-foreground-gdk" _name="Foreground Color column" save="False" default="-1" 
-		  custom-layout="True">
+        <property id="foreground-gdk" save="False" custom-layout="True"></property>
+        <property id="attr-foreground-gdk" _name="Foreground Color column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -2667,7 +2660,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="language" save="False" custom-layout="True"/>
+        <property id="language" save="False" custom-layout="True"></property>
         <property id="attr-language" _name="Language column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2681,7 +2674,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="markup" save="False" custom-layout="True"/>
+        <property id="markup" save="False" custom-layout="True"></property>
         <property id="attr-markup" _name="Markup column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2695,7 +2688,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="rise" save="False" custom-layout="True"/>
+        <property id="rise" save="False" custom-layout="True"></property>
         <property id="attr-rise" _name="Rise column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2709,7 +2702,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="scale" save="False" custom-layout="True"/>
+        <property id="scale" save="False" custom-layout="True"></property>
         <property id="attr-scale" _name="Scale column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2723,9 +2716,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="single-paragraph-mode" save="False" custom-layout="True"/>
-        <property id="attr-single-paragraph-mode" _name="Single Paragraph Mode column" save="False" 
-		  default="-1" custom-layout="True">
+        <property id="single-paragraph-mode" save="False" custom-layout="True"></property>
+        <property id="attr-single-paragraph-mode" _name="Single Paragraph Mode column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -2738,7 +2730,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="size" save="False" custom-layout="True"/>
+        <property id="size" save="False" custom-layout="True"></property>
         <property id="attr-size" _name="Size column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2752,7 +2744,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="size-points" save="False" custom-layout="True"/>
+        <property id="size-points" save="False" custom-layout="True"></property>
         <property id="attr-size-points" _name="Data column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2768,15 +2760,15 @@ embedded in another object</_tooltip>
 
         <property id="stretch" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="PANGO_STRETCH_ULTRA_CONDENSED" _name="Ultra Condensed"/>
-	    <value id="PANGO_STRETCH_EXTRA_CONDENSED" _name="Extra Condensed"/>
-	    <value id="PANGO_STRETCH_CONDENSED" _name="Condensed"/>
-	    <value id="PANGO_STRETCH_SEMI_CONDENSED" _name="Semi Condensed"/>
-	    <value id="PANGO_STRETCH_NORMAL" _name="Normal"/>
-	    <value id="PANGO_STRETCH_SEMI_EXPANDED" _name="Semi Expanded"/>
-	    <value id="PANGO_STRETCH_EXPANDED" _name="Expanded"/>
-	    <value id="PANGO_STRETCH_EXTRA_EXPANDED" _name="Extra Expanded"/>
-	    <value id="PANGO_STRETCH_ULTRA_EXPANDED" _name="Ultra Expanded"/>
+	    <value id="PANGO_STRETCH_ULTRA_CONDENSED" _name="Ultra Condensed"></value>
+	    <value id="PANGO_STRETCH_EXTRA_CONDENSED" _name="Extra Condensed"></value>
+	    <value id="PANGO_STRETCH_CONDENSED" _name="Condensed"></value>
+	    <value id="PANGO_STRETCH_SEMI_CONDENSED" _name="Semi Condensed"></value>
+	    <value id="PANGO_STRETCH_NORMAL" _name="Normal"></value>
+	    <value id="PANGO_STRETCH_SEMI_EXPANDED" _name="Semi Expanded"></value>
+	    <value id="PANGO_STRETCH_EXPANDED" _name="Expanded"></value>
+	    <value id="PANGO_STRETCH_EXTRA_EXPANDED" _name="Extra Expanded"></value>
+	    <value id="PANGO_STRETCH_ULTRA_EXPANDED" _name="Ultra Expanded"></value>
 	  </displayable-values>
 	</property>
 
@@ -2793,7 +2785,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="strikethrough" save="False" custom-layout="True"/>
+        <property id="strikethrough" save="False" custom-layout="True"></property>
         <property id="attr-strikethrough" _name="Strikethrough column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2809,9 +2801,9 @@ embedded in another object</_tooltip>
 
         <property id="style" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="PANGO_STYLE_NORMAL" _name="Normal"/>
-	    <value id="PANGO_STYLE_OBLIQUE" _name="Oblique"/>
-	    <value id="PANGO_STYLE_ITALIC" _name="Italic"/>
+	    <value id="PANGO_STYLE_NORMAL" _name="Normal"></value>
+	    <value id="PANGO_STYLE_OBLIQUE" _name="Oblique"></value>
+	    <value id="PANGO_STYLE_ITALIC" _name="Italic"></value>
 	  </displayable-values>
 	</property>
         <property id="attr-style" _name="Style column" save="False" default="-1" custom-layout="True">
@@ -2827,7 +2819,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="text" save="False" custom-layout="True"/>
+        <property id="text" save="False" custom-layout="True"></property>
         <property id="attr-text" _name="Text column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2843,11 +2835,11 @@ embedded in another object</_tooltip>
 
         <property id="underline" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="PANGO_UNDERLINE_NONE" _name="None"/>
-	    <value id="PANGO_UNDERLINE_SINGLE" _name="Single"/>
-	    <value id="PANGO_UNDERLINE_DOUBLE" _name="Double"/>
-	    <value id="PANGO_UNDERLINE_LOW" _name="Low"/>
-	    <value id="PANGO_UNDERLINE_ERROR" _name="Error"/>
+	    <value id="PANGO_UNDERLINE_NONE" _name="None"></value>
+	    <value id="PANGO_UNDERLINE_SINGLE" _name="Single"></value>
+	    <value id="PANGO_UNDERLINE_DOUBLE" _name="Double"></value>
+	    <value id="PANGO_UNDERLINE_LOW" _name="Low"></value>
+	    <value id="PANGO_UNDERLINE_ERROR" _name="Error"></value>
 	  </displayable-values>
 	</property>
         <property id="attr-underline" _name="Underline column" save="False" default="-1" custom-layout="True">
@@ -2865,8 +2857,8 @@ embedded in another object</_tooltip>
 
         <property id="variant" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="PANGO_VARIANT_NORMAL" _name="Normal"/>
-	    <value id="PANGO_VARIANT_SMALL_CAPS" _name="Small Capitals"/>
+	    <value id="PANGO_VARIANT_NORMAL" _name="Normal"></value>
+	    <value id="PANGO_VARIANT_SMALL_CAPS" _name="Small Capitals"></value>
 	  </displayable-values>
 	</property>
         <property id="attr-variant" _name="Variant column" save="False" default="-1" custom-layout="True">
@@ -2882,7 +2874,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="weight" save="False" custom-layout="True"/>
+        <property id="weight" save="False" custom-layout="True"></property>
         <property id="attr-weight" _name="Weight column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2896,7 +2888,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="width-chars" save="False" custom-layout="True"/>
+        <property id="width-chars" save="False" custom-layout="True"></property>
         <property id="attr-width-chars" _name="Width in Characters column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2910,7 +2902,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="wrap-mode" save="False" custom-layout="True"/>
+        <property id="wrap-mode" save="False" custom-layout="True"></property>
         <property id="attr-wrap-mode" _name="Wrap Mode column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2924,7 +2916,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="wrap-width" save="False" custom-layout="True"/>
+        <property id="wrap-width" save="False" custom-layout="True"></property>
         <property id="attr-wrap-width" _name="Wrap Width column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -2938,9 +2930,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="background-rgba" save="False" custom-layout="True" since="3.0"/>
-        <property id="attr-background-rgba" _name="Background RGBA column" save="False" 
-		  default="-1" custom-layout="True" since="3.0">
+        <property id="background-rgba" save="False" custom-layout="True" since="3.0"></property>
+        <property id="attr-background-rgba" _name="Background RGBA column" save="False" default="-1" custom-layout="True" since="3.0">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -2953,9 +2944,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="foreground-rgba" save="False" custom-layout="True" since="3.0"/>
-        <property id="attr-foreground-rgba" _name="Foreground RGBA column" save="False" 
-		  default="-1" custom-layout="True" since="3.0">
+        <property id="foreground-rgba" save="False" custom-layout="True" since="3.0"></property>
+        <property id="attr-foreground-rgba" _name="Foreground RGBA column" save="False" default="-1" custom-layout="True" since="3.0">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -2968,9 +2958,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="max-width-chars" save="False" custom-layout="True" since="3.0"/>
-        <property id="attr-max-width-chars" _name="Maximum width in charachters column" 
-		  save="False" default="-1" custom-layout="True" since="3.0">
+        <property id="max-width-chars" save="False" custom-layout="True" since="3.0"></property>
+        <property id="attr-max-width-chars" _name="Maximum width in charachters column" save="False" default="-1" custom-layout="True" since="3.0">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -2985,10 +2974,9 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkCellRendererAccel" 
-			generic-name="cellrendereraccel" _title="Accelerator Renderer">
+    <glade-widget-class name="GtkCellRendererAccel" generic-name="cellrendereraccel" _title="Accelerator Renderer">
       <properties>
-        <property id="accel-key" save="False" custom-layout="True"/>
+        <property id="accel-key" save="False" custom-layout="True"></property>
         <property id="attr-accel-key" _name="Data column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3004,8 +2992,8 @@ embedded in another object</_tooltip>
 
         <property id="accel-mode" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="GTK_CELL_RENDERER_ACCEL_MODE_GTK" _name="Gtk"/>
-	    <value id="GTK_CELL_RENDERER_ACCEL_MODE_OTHER" _name="Other"/>
+	    <value id="GTK_CELL_RENDERER_ACCEL_MODE_GTK" _name="Gtk"></value>
+	    <value id="GTK_CELL_RENDERER_ACCEL_MODE_OTHER" _name="Other"></value>
 	  </displayable-values>
 	</property>
         <property id="attr-accel-mode" _name="Accelerator Mode column" save="False" default="-1" custom-layout="True">
@@ -3023,24 +3011,24 @@ embedded in another object</_tooltip>
 
         <property id="accel-mods" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="GDK_SHIFT_MASK" _name="Shift Key"/>
-	    <value id="GDK_LOCK_MASK" _name="Lock Key"/>
-	    <value id="GDK_CONTROL_MASK" _name="Control Key"/>
-	    <value id="GDK_MOD1_MASK" _name="Alt Key"/>
-	    <value id="GDK_MOD2_MASK" _name="Fifth Key"/>
-	    <value id="GDK_MOD3_MASK" _name="Sixth Key"/>
-	    <value id="GDK_MOD4_MASK" _name="Seventh Key"/>
-	    <value id="GDK_MOD5_MASK" _name="Eighth Key"/>
-	    <value id="GDK_BUTTON1_MASK" _name="First Mouse Button"/>
-	    <value id="GDK_BUTTON2_MASK" _name="Second Mouse Button"/>
-	    <value id="GDK_BUTTON3_MASK" _name="Third Mouse Button"/>
-	    <value id="GDK_BUTTON4_MASK" _name="Forth Mouse Button"/>
-	    <value id="GDK_BUTTON5_MASK" _name="Fifth Mouse Button"/>
-	    <value id="GDK_SUPER_MASK" _name="Super Modifier"/>
-	    <value id="GDK_HYPER_MASK" _name="Hyper Modifier"/>
-	    <value id="GDK_META_MASK" _name="Meta Modifier"/>
-	    <value id="GDK_RELEASE_MASK" _name="Release Modifier"/>
-	    <value id="GDK_MODIFIER_MASK" _name="All Modifiers"/>
+	    <value id="GDK_SHIFT_MASK" _name="Shift Key"></value>
+	    <value id="GDK_LOCK_MASK" _name="Lock Key"></value>
+	    <value id="GDK_CONTROL_MASK" _name="Control Key"></value>
+	    <value id="GDK_MOD1_MASK" _name="Alt Key"></value>
+	    <value id="GDK_MOD2_MASK" _name="Fifth Key"></value>
+	    <value id="GDK_MOD3_MASK" _name="Sixth Key"></value>
+	    <value id="GDK_MOD4_MASK" _name="Seventh Key"></value>
+	    <value id="GDK_MOD5_MASK" _name="Eighth Key"></value>
+	    <value id="GDK_BUTTON1_MASK" _name="First Mouse Button"></value>
+	    <value id="GDK_BUTTON2_MASK" _name="Second Mouse Button"></value>
+	    <value id="GDK_BUTTON3_MASK" _name="Third Mouse Button"></value>
+	    <value id="GDK_BUTTON4_MASK" _name="Forth Mouse Button"></value>
+	    <value id="GDK_BUTTON5_MASK" _name="Fifth Mouse Button"></value>
+	    <value id="GDK_SUPER_MASK" _name="Super Modifier"></value>
+	    <value id="GDK_HYPER_MASK" _name="Hyper Modifier"></value>
+	    <value id="GDK_META_MASK" _name="Meta Modifier"></value>
+	    <value id="GDK_RELEASE_MASK" _name="Release Modifier"></value>
+	    <value id="GDK_MODIFIER_MASK" _name="All Modifiers"></value>
 	  </displayable-values>
 	</property>
         <property id="attr-accel-mods" _name="Accelerator Modifiers column" save="False" default="-1" custom-layout="True">
@@ -3056,7 +3044,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="keycode" save="False" custom-layout="True"/>
+        <property id="keycode" save="False" custom-layout="True"></property>
         <property id="attr-keycode" _name="Keycode column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3072,14 +3060,14 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkCellRendererCombo" generic-name="cellrenderercombo" _title="Combo Renderer" >
+    <glade-widget-class name="GtkCellRendererCombo" generic-name="cellrenderercombo" _title="Combo Renderer">
 
       <signals>
-	<signal id="changed" since="2.14"/>
+	<signal id="changed" since="2.14"></signal>
       </signals>
 
       <properties>
-        <property id="has-entry" save="False" custom-layout="True"/>
+        <property id="has-entry" save="False" custom-layout="True"></property>
         <property id="attr-has-entry" _name="Has Entry column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3093,7 +3081,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="model" save="False" custom-layout="True"/>
+        <property id="model" save="False" custom-layout="True"></property>
         <property id="attr-model" _name="Model column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3107,7 +3095,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="text-column" save="False" custom-layout="True"/>
+        <property id="text-column" save="False" custom-layout="True"></property>
         <property id="attr-text-column" _name="Text Column column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3124,9 +3112,9 @@ embedded in another object</_tooltip>
     </glade-widget-class>
 
 
-    <glade-widget-class name="GtkCellRendererSpin" generic-name="cellrendererspin" _title="Spin Renderer" >
+    <glade-widget-class name="GtkCellRendererSpin" generic-name="cellrendererspin" _title="Spin Renderer">
       <properties>
-        <property id="adjustment" save="False" custom-layout="True"/>
+        <property id="adjustment" save="False" custom-layout="True"></property>
         <property id="attr-adjustment" _name="Adjustment column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3140,7 +3128,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="climb-rate" save="False" custom-layout="True"/>
+        <property id="climb-rate" save="False" custom-layout="True"></property>
         <property id="attr-climb-rate" _name="Climb Rate column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3154,7 +3142,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="digits" save="False" custom-layout="True"/>
+        <property id="digits" save="False" custom-layout="True"></property>
         <property id="attr-digits" _name="Digits column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3173,9 +3161,9 @@ embedded in another object</_tooltip>
     <glade-widget-class name="GtkCellRendererPixbuf" generic-name="cellrendererpixbuf" _title="Pixbuf Renderer">
 
       <properties>
-        <property id="gicon" disabled="True"/>
+        <property id="gicon" disabled="True"></property>
 
-        <property id="follow-state" save="False" custom-layout="True"/>
+        <property id="follow-state" save="False" custom-layout="True"></property>
         <property id="attr-follow-state" _name="Follow State column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3189,7 +3177,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="icon-name" save="False" themed-icon="True" custom-layout="True"/>
+        <property id="icon-name" save="False" themed-icon="True" custom-layout="True"></property>
         <property id="attr-icon-name" _name="Icon Name column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3203,7 +3191,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="pixbuf" save="False" custom-layout="True"/>
+        <property id="pixbuf" save="False" custom-layout="True"></property>
         <property id="attr-pixbuf" _name="Pixbuf column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3217,9 +3205,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="pixbuf-expander-closed" save="False" custom-layout="True"/>
-        <property id="attr-pixbuf-expander-closed" _name="Pixbuf Expander Closed column" save="False" 
-		  default="-1" custom-layout="True">
+        <property id="pixbuf-expander-closed" save="False" custom-layout="True"></property>
+        <property id="attr-pixbuf-expander-closed" _name="Pixbuf Expander Closed column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -3232,9 +3219,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="pixbuf-expander-open" save="False" custom-layout="True"/>
-        <property id="attr-pixbuf-expander-open" _name="Pixbuf Expander Open column" save="False" 
-		  default="-1" custom-layout="True">
+        <property id="pixbuf-expander-open" save="False" custom-layout="True"></property>
+        <property id="attr-pixbuf-expander-open" _name="Pixbuf Expander Open column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -3247,7 +3233,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="stock-detail" save="False" custom-layout="True"/>
+        <property id="stock-detail" save="False" custom-layout="True"></property>
         <property id="attr-stock-detail" _name="Stock Detail column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3261,7 +3247,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="stock-id" save="False" stock-icon="True" custom-layout="True"/>
+        <property id="stock-id" save="False" stock-icon="True" custom-layout="True"></property>
         <property id="attr-stock-id" _name="Stock column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3275,7 +3261,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="stock-size" save="False" custom-layout="True"/>
+        <property id="stock-size" save="False" custom-layout="True"></property>
         <property id="attr-stock-size" _name="Stock Size column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3291,9 +3277,9 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkCellRendererProgress" generic-name="cellrendererprogress" _title="Progress Renderer" >
+    <glade-widget-class name="GtkCellRendererProgress" generic-name="cellrendererprogress" _title="Progress Renderer">
       <properties>
-        <property id="orientation" save="False" custom-layout="True"/>
+        <property id="orientation" save="False" custom-layout="True"></property>
         <property id="attr-orientation" _name="Orientation column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3307,7 +3293,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="pulse" save="False" custom-layout="True"/>
+        <property id="pulse" save="False" custom-layout="True"></property>
         <property id="attr-pulse" _name="Pulse column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3321,7 +3307,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="text" save="False" custom-layout="True"/>
+        <property id="text" save="False" custom-layout="True"></property>
         <property id="attr-text" _name="Text column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3335,9 +3321,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="text-xalign" save="False" custom-layout="True"/>
-        <property id="attr-text-xalign" _name="Text Horizontal Alignment column" save="False" 
-		  default="-1" custom-layout="True">
+        <property id="text-xalign" save="False" custom-layout="True"></property>
+        <property id="attr-text-xalign" _name="Text Horizontal Alignment column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -3350,9 +3335,8 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="text-yalign" save="False" custom-layout="True"/>
-        <property id="attr-text-yalign" _name="Text Vertical Alignment column" save="False" 
-		  default="-1" custom-layout="True">
+        <property id="text-yalign" save="False" custom-layout="True"></property>
+        <property id="attr-text-yalign" _name="Text Vertical Alignment column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
 	    <min>-1</min>
@@ -3365,7 +3349,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="value" save="False" custom-layout="True"/>
+        <property id="value" save="False" custom-layout="True"></property>
         <property id="attr-value" _name="Value column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3379,7 +3363,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="inverted" save="False" custom-layout="True"/>
+        <property id="inverted" save="False" custom-layout="True"></property>
         <property id="attr-inverted" _name="Inverted column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3398,7 +3382,7 @@ embedded in another object</_tooltip>
 
     <glade-widget-class name="GtkCellRendererSpinner" generic-name="cellrendererspinner" _title="Spinner Renderer" since="2.20">
       <properties>
-        <property id="active" save="False" custom-layout="True"/>
+        <property id="active" save="False" custom-layout="True"></property>
         <property id="attr-active" _name="Active column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3412,7 +3396,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="pulse" save="False" custom-layout="True"/>
+        <property id="pulse" save="False" custom-layout="True"></property>
         <property id="attr-pulse" _name="Pulse column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3426,7 +3410,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="size" save="False" custom-layout="True"/>
+        <property id="size" save="False" custom-layout="True"></property>
         <property id="attr-size" _name="Icon Size" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3445,7 +3429,7 @@ embedded in another object</_tooltip>
 
     <glade-widget-class name="GtkCellRendererToggle" generic-name="cellrenderertoggle" _title="Toggle Renderer">
       <properties>
-        <property id="activatable" save="False" custom-layout="True"/>
+        <property id="activatable" save="False" custom-layout="True"></property>
         <property id="attr-activatable" _name="Activatable column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3459,7 +3443,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="active" save="False" custom-layout="True"/>
+        <property id="active" save="False" custom-layout="True"></property>
         <property id="attr-active" _name="Active column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3473,7 +3457,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="inconsistent" save="False" custom-layout="True"/>
+        <property id="inconsistent" save="False" custom-layout="True"></property>
         <property id="attr-inconsistent" _name="Inconsistent column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3487,7 +3471,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="indicator-size" save="False" custom-layout="True"/>
+        <property id="indicator-size" save="False" custom-layout="True"></property>
         <property id="attr-indicator-size" _name="Indicator Size column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3501,7 +3485,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
 	</property>
 
-        <property id="radio" save="False" custom-layout="True"/>
+        <property id="radio" save="False" custom-layout="True"></property>
         <property id="attr-radio" _name="Radio column" save="False" default="-1" custom-layout="True">
 	  <parameter-spec>
 	    <type>GParamInt</type>
@@ -3520,10 +3504,10 @@ embedded in another object</_tooltip>
 
     <glade-widget-class name="GtkStatusIcon" generic-name="statusicon" _title="Status Icon" toplevel="True">
       <properties>
-	<property id="gicon" disabled="True" since="2.14"/>
-	<property id="title" since="2.18" translatable="True"/>
-	<property id="tooltip-text" since="2.16" translatable="True"/>
-	<property id="tooltip-markup" since="2.16" translatable="True"/>
+	<property id="gicon" disabled="True" since="2.14"></property>
+	<property id="title" since="2.18" translatable="True"></property>
+	<property id="tooltip-text" since="2.16" translatable="True"></property>
+	<property id="tooltip-markup" since="2.16" translatable="True"></property>
       </properties>
     </glade-widget-class>
 
@@ -3531,71 +3515,69 @@ embedded in another object</_tooltip>
       <post-create-function>glade_gtk_text_buffer_post_create</post-create-function>
       <set-property-function>glade_gtk_text_buffer_set_property</set-property-function>
       <signals>
-	<signal id="paste-done" since="2.16"/>
+	<signal id="paste-done" since="2.16"></signal>
       </signals>
       
       <properties>
-	<property id="text" translatable="True" multiline="True"/>
+	<property id="text" translatable="True" multiline="True"></property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkEntryBuffer" generic-name="entrybuffer" _title="Entry Buffer" 
-			toplevel="True" since="2.18">
+    <glade-widget-class name="GtkEntryBuffer" generic-name="entrybuffer" _title="Entry Buffer" toplevel="True" since="2.18">
       <post-create-function>glade_gtk_entry_buffer_post_create</post-create-function>
       <set-property-function>glade_gtk_entry_buffer_set_property</set-property-function>
       <properties>
-	<property id="text" translatable="True" multiline="True"/>
+	<property id="text" translatable="True" multiline="True"></property>
       </properties>
     </glade-widget-class>
 
 
-    <glade-widget-class name="GtkTextTag" generic-name="texttag" _title="Text Tag" >
+    <glade-widget-class name="GtkTextTag" generic-name="texttag" _title="Text Tag">
       <properties>
-	<property id="background-gdk" default="White" optional="True" optional-default="False"/>
-	<property id="foreground-gdk" default="Black" optional="True" optional-default="False"/>
-	<property id="paragraph-background-gdk" default="White" optional="True" optional-default="False"/>
-	<property id="language" optional="True" optional-default="False"/>
+	<property id="background-gdk" default="White" optional="True" optional-default="False"></property>
+	<property id="foreground-gdk" default="Black" optional="True" optional-default="False"></property>
+	<property id="paragraph-background-gdk" default="White" optional="True" optional-default="False"></property>
+	<property id="language" optional="True" optional-default="False"></property>
 
 	<!-- Disabled state parameters -->
-	<property id="background-set" disabled="True"/>
-	<property id="background-full-height-set" disabled="True"/>
-	<property id="foreground-set" disabled="True"/>
-	<property id="editable-set" disabled="True"/>
-	<property id="family-set" disabled="True"/>
-	<property id="style-set" disabled="True"/>
-	<property id="variant-set" disabled="True"/>
-	<property id="weight-set" disabled="True"/>
-	<property id="stretch-set" disabled="True"/>
-	<property id="size-set" disabled="True"/>
-	<property id="scale-set" disabled="True"/>
-	<property id="justification-set" disabled="True"/>
-	<property id="language-set" disabled="True"/>
-	<property id="left-margin-set" disabled="True"/>
-	<property id="indent-set" disabled="True"/>
-	<property id="rise-set" disabled="True"/>
-	<property id="pixels-above-lines-set" disabled="True"/>
-	<property id="pixels-below-lines-set" disabled="True"/>
-	<property id="pixels-inside-wrap-set" disabled="True"/>
-	<property id="strikethrough-set" disabled="True"/>
-	<property id="right-margin-set" disabled="True"/>
-	<property id="underline-set" disabled="True"/>
-	<property id="wrap-mode-set" disabled="True"/>
-	<property id="tabs-set" disabled="True"/>
-	<property id="invisible-set" disabled="True"/>
-	<property id="paragraph-background-set" disabled="True"/>
+	<property id="background-set" disabled="True"></property>
+	<property id="background-full-height-set" disabled="True"></property>
+	<property id="foreground-set" disabled="True"></property>
+	<property id="editable-set" disabled="True"></property>
+	<property id="family-set" disabled="True"></property>
+	<property id="style-set" disabled="True"></property>
+	<property id="variant-set" disabled="True"></property>
+	<property id="weight-set" disabled="True"></property>
+	<property id="stretch-set" disabled="True"></property>
+	<property id="size-set" disabled="True"></property>
+	<property id="scale-set" disabled="True"></property>
+	<property id="justification-set" disabled="True"></property>
+	<property id="language-set" disabled="True"></property>
+	<property id="left-margin-set" disabled="True"></property>
+	<property id="indent-set" disabled="True"></property>
+	<property id="rise-set" disabled="True"></property>
+	<property id="pixels-above-lines-set" disabled="True"></property>
+	<property id="pixels-below-lines-set" disabled="True"></property>
+	<property id="pixels-inside-wrap-set" disabled="True"></property>
+	<property id="strikethrough-set" disabled="True"></property>
+	<property id="right-margin-set" disabled="True"></property>
+	<property id="underline-set" disabled="True"></property>
+	<property id="wrap-mode-set" disabled="True"></property>
+	<property id="tabs-set" disabled="True"></property>
+	<property id="invisible-set" disabled="True"></property>
+	<property id="paragraph-background-set" disabled="True"></property>
 
         <property id="direction">
   	  <displayable-values>
-	    <value id="GTK_TEXT_DIR_NONE" _name="None"/>
-	    <value id="GTK_TEXT_DIR_LTR" _name="Left to Right"/>
-	    <value id="GTK_TEXT_DIR_RTL" _name="Right to Left"/>
+	    <value id="GTK_TEXT_DIR_NONE" _name="None"></value>
+	    <value id="GTK_TEXT_DIR_LTR" _name="Left to Right"></value>
+	    <value id="GTK_TEXT_DIR_RTL" _name="Right to Left"></value>
 	  </displayable-values>
 	</property>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkTextTagTable" generic-name="texttagtable" _title="Text Tag Table" 
-			toplevel="True">
+    <glade-widget-class name="GtkTextTagTable" generic-name="texttagtable" _title="Text Tag Table" toplevel="True">
       <add-child-verify-function>glade_gtk_text_tag_table_add_verify</add-child-verify-function>
       <add-child-function>glade_gtk_text_tag_table_add_child</add-child-function>
       <remove-child-function>glade_gtk_text_tag_table_remove_child</remove-child-function> 
@@ -3604,12 +3586,11 @@ embedded in another object</_tooltip>
       <special-child-type>tag</special-child-type>
 
       <actions>
-        <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+        <action id="launch_editor" _name="Editâ?¦" stock="gtk-edit" important="True"></action>
       </actions>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkFileFilter" generic-name="filefilter" _title="File Filter" 
-			toplevel="True">
+    <glade-widget-class name="GtkFileFilter" generic-name="filefilter" _title="File Filter" toplevel="True">
       <create-editor-property-function>glade_gtk_recent_file_filter_create_eprop</create-editor-property-function>
       <string-from-value-function>glade_gtk_recent_file_filter_string_from_value</string-from-value-function>
       <read-widget-function>glade_gtk_recent_filter_read_widget</read-widget-function>
@@ -3632,8 +3613,7 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkRecentFilter" generic-name="recentfilter" _title="Recent Filter" 
-			toplevel="True">
+    <glade-widget-class name="GtkRecentFilter" generic-name="recentfilter" _title="Recent Filter" toplevel="True">
       <create-editor-property-function>glade_gtk_recent_file_filter_create_eprop</create-editor-property-function>
       <string-from-value-function>glade_gtk_recent_file_filter_string_from_value</string-from-value-function>
       <read-widget-function>glade_gtk_recent_filter_read_widget</read-widget-function>
@@ -3663,135 +3643,136 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
-    <glade-widget-class name="GtkRecentManager" generic-name="recentmanager" _title="Recent Manager" 
-			toplevel="True"/>
+    <glade-widget-class name="GtkRecentManager" generic-name="recentmanager" _title="Recent Manager" toplevel="True"></glade-widget-class>
 
   </glade-widget-classes>
   
   <glade-widget-group name="gtk-actions" _title="Actions">
 
-    <glade-widget-class-ref name="GtkActionGroup"/>
-    <glade-widget-class-ref name="GtkAction"/>
-    <glade-widget-class-ref name="GtkToggleAction"/>
-    <glade-widget-class-ref name="GtkRadioAction"/>
-    <glade-widget-class-ref name="GtkRecentAction"/>
+    <glade-widget-class-ref name="GtkActionGroup"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAction"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkToggleAction"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkRadioAction"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkRecentAction"></glade-widget-class-ref>
   </glade-widget-group>
 
   <glade-widget-group name="gtk-toplevels" _title="Toplevels">
-    <glade-widget-class-ref name="GtkWindow"/>
-    <glade-widget-class-ref name="GtkOffscreenWindow"/>
-    <glade-widget-class-ref name="GtkDialog"/>
-    <glade-widget-class-ref name="GtkAboutDialog"/>
-    <glade-widget-class-ref name="GtkColorSelectionDialog"/>
-    <glade-widget-class-ref name="GtkFileChooserDialog"/>
-    <glade-widget-class-ref name="GtkFontSelectionDialog"/>
-    <glade-widget-class-ref name="GtkMessageDialog"/>
-    <glade-widget-class-ref name="GtkRecentChooserDialog"/>
-    <glade-widget-class-ref name="GtkAssistant"/>
-    <glade-widget-class-ref name="GtkAppChooserDialog"/>
+    <glade-widget-class-ref name="GtkWindow"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkOffscreenWindow"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkDialog"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAboutDialog"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkColorSelectionDialog"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkFileChooserDialog"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkFontSelectionDialog"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkMessageDialog"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkRecentChooserDialog"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAssistant"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAppChooserDialog"></glade-widget-class-ref>
   </glade-widget-group>
 
   <glade-widget-group name="gtk-containers" _title="Containers">
-    <glade-widget-class-ref name="GtkBox"/>
-    <glade-widget-class-ref name="GtkGrid"/>
-    <glade-widget-class-ref name="GtkNotebook"/>
-    <glade-widget-class-ref name="GtkFrame"/>
-    <glade-widget-class-ref name="GtkAspectFrame"/>
-    <glade-widget-class-ref name="GtkMenuBar"/>
-    <glade-widget-class-ref name="GtkToolbar"/>
-    <glade-widget-class-ref name="GtkToolPalette"/>
-    <glade-widget-class-ref name="GtkPaned"/>
-    <glade-widget-class-ref name="GtkButtonBox"/>
-    <glade-widget-class-ref name="GtkLayout"/>
-    <glade-widget-class-ref name="GtkFixed"/>
-    <glade-widget-class-ref name="GtkEventBox"/>
-    <glade-widget-class-ref name="GtkExpander"/>
-    <glade-widget-class-ref name="GtkViewport"/>
-    <glade-widget-class-ref name="GtkScrolledWindow"/>
-    <glade-widget-class-ref name="GtkAlignment"/>
+    <glade-widget-class-ref name="GtkBox"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkGrid"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkNotebook"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkFrame"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAspectFrame"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkMenuBar"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkToolbar"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkToolPalette"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkPaned"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkButtonBox"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkLayout"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkFixed"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkEventBox"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkExpander"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkViewport"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkScrolledWindow"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAlignment"></glade-widget-class-ref>
   </glade-widget-group>
 
   <glade-widget-group name="gtk-control-display" _title="Control and Display">
 
-    <glade-widget-class-ref name="GtkButton"/>
-    <glade-widget-class-ref name="GtkToggleButton"/>
-    <glade-widget-class-ref name="GtkCheckButton"/>
-    <glade-widget-class-ref name="GtkRadioButton"/>
+    <glade-widget-class-ref name="GtkButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkToggleButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkCheckButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkRadioButton"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkEntry"/>
-    <glade-widget-class-ref name="GtkSpinButton"/>
+    <glade-widget-class-ref name="GtkEntry"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkSpinButton"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkComboBox"/>
-    <glade-widget-class-ref name="GtkComboBoxText"/>
+    <glade-widget-class-ref name="GtkComboBox"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkComboBoxText"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkImage"/>
-    <glade-widget-class-ref name="GtkLabel"/>
-    <glade-widget-class-ref name="GtkAccelLabel"/>
+    <glade-widget-class-ref name="GtkImage"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkLabel"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAccelLabel"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkFileChooserButton"/>
-    <glade-widget-class-ref name="GtkColorButton"/>
-    <glade-widget-class-ref name="GtkFontButton"/>
-    <glade-widget-class-ref name="GtkLinkButton"/>
-    <glade-widget-class-ref name="GtkScaleButton"/>
-    <glade-widget-class-ref name="GtkVolumeButton"/>\
-    <glade-widget-class-ref name="GtkAppChooserButton"/>
+    <glade-widget-class-ref name="GtkFileChooserButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkColorButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkFontButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkLinkButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkScaleButton"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkVolumeButton"></glade-widget-class-ref>\
+    <glade-widget-class-ref name="GtkAppChooserButton"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkScale"/>
-    <glade-widget-class-ref name="GtkScrollbar"/>
+    <glade-widget-class-ref name="GtkScale"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkScrollbar"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkProgressBar"/>
-    <glade-widget-class-ref name="GtkSpinner"/>
+    <glade-widget-class-ref name="GtkProgressBar"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkSpinner"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkTextView"/>
+    <glade-widget-class-ref name="GtkTextView"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkTreeView"/>
-    <glade-widget-class-ref name="GtkIconView"/>
+    <glade-widget-class-ref name="GtkTreeView"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkIconView"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkHandleBox"/>
-    <glade-widget-class-ref name="GtkStatusbar"/>
+    <glade-widget-class-ref name="GtkHandleBox"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkStatusbar"></glade-widget-class-ref>
 
-    <glade-widget-class-ref name="GtkCalendar"/>
-    <glade-widget-class-ref name="GtkMenu"/>
-    <glade-widget-class-ref name="GtkSeparator"/>
-    <glade-widget-class-ref name="GtkArrow"/>
-    <glade-widget-class-ref name="GtkDrawingArea"/>
+    <glade-widget-class-ref name="GtkCalendar"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkMenu"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkSeparator"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkArrow"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkDrawingArea"></glade-widget-class-ref>
+    
+    <glade-widget-class-ref name="GtkInfoBar"></glade-widget-class-ref>
   </glade-widget-group>
 
   <glade-widget-group name="gtk-composite" _title="Composite Widgets">
 
-    <default-palette-state expanded="False"/>
+    <default-palette-state expanded="False"></default-palette-state>
 
-    <glade-widget-class-ref name="GtkColorSelection"/>
-    <glade-widget-class-ref name="GtkFontSelection"/>
-    <glade-widget-class-ref name="GtkRecentChooserWidget"/>
-    <glade-widget-class-ref name="GtkFileChooserWidget"/>
-    <glade-widget-class-ref name="GtkAppChooserWidget"/>
+    <glade-widget-class-ref name="GtkColorSelection"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkFontSelection"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkRecentChooserWidget"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkFileChooserWidget"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAppChooserWidget"></glade-widget-class-ref>
   </glade-widget-group>
 
   <glade-widget-group name="gtk-objects" _title="Miscellaneous">
 
-    <default-palette-state expanded="False"/>
-
-    <glade-widget-class-ref name="GtkListStore"/>
-    <glade-widget-class-ref name="GtkTreeStore"/>
-    <glade-widget-class-ref name="GtkTreeModelFilter"/>
-    <glade-widget-class-ref name="GtkTreeModelSort"/>
-
-    <glade-widget-class-ref name="GtkEntryBuffer"/>
-    <glade-widget-class-ref name="GtkTextBuffer"/>
-    <glade-widget-class-ref name="GtkTextTag"/>
-    <glade-widget-class-ref name="GtkTextTagTable"/>
-
-    <glade-widget-class-ref name="GtkSizeGroup"/>
-    <glade-widget-class-ref name="GtkWindowGroup"/>
-    <glade-widget-class-ref name="GtkAccelGroup"/>
-    <glade-widget-class-ref name="GtkAdjustment"/>
-    <glade-widget-class-ref name="GtkEntryCompletion"/>
-    <glade-widget-class-ref name="GtkIconFactory"/>
-    <glade-widget-class-ref name="GtkStatusIcon"/>
-    <glade-widget-class-ref name="GtkFileFilter"/>
-    <glade-widget-class-ref name="GtkRecentFilter"/>
-    <glade-widget-class-ref name="GtkRecentManager"/>
+    <default-palette-state expanded="False"></default-palette-state>
+
+    <glade-widget-class-ref name="GtkListStore"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkTreeStore"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkTreeModelFilter"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkTreeModelSort"></glade-widget-class-ref>
+
+    <glade-widget-class-ref name="GtkEntryBuffer"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkTextBuffer"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkTextTag"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkTextTagTable"></glade-widget-class-ref>
+
+    <glade-widget-class-ref name="GtkSizeGroup"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkWindowGroup"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAccelGroup"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkAdjustment"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkEntryCompletion"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkIconFactory"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkStatusIcon"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkFileFilter"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkRecentFilter"></glade-widget-class-ref>
+    <glade-widget-class-ref name="GtkRecentManager"></glade-widget-class-ref>
   </glade-widget-group>
 
 </glade-catalog>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]