Respect the Glade namespace for macros and defines

30 files changed, 59 insertions, 59 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c9d53672..bf359bab 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -61,6 +61,7 @@ IGNORE_HFILES=\
 	glade.h \
 	glade-design-layout.h \
 	glade-popup.h \
+	glade-private.h \
 	glade-gtk.h \
 	glade-palette-expander.h \
 	glade-palette-item.h \
diff --git a/doc/gladeui-sections.txt b/doc/gladeui-sections.txt
index 0f09775a..da1c47b7 100644
--- a/doc/gladeui-sections.txt
+++ b/doc/gladeui-sections.txt
@@ -216,8 +216,7 @@ GWA_GET_OCLASS
 GWA_SCROLLABLE_WIDGET
 GLADE_VALID_CREATE_REASON
 GLADE_TYPE_CREATE_REASON
-GWA_INSTANTIABLE_PREFIX
-GWA_INSTANTIABLE_PREFIX_LEN
+GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX
 GladeWidgetAdaptor
 GladeActionActivateFunc
 GladeActionSubmenuFunc
@@ -377,8 +376,6 @@ GladeDesignViewPrivate
 
 <SECTION>
 <FILE>glade-property-def</FILE>
-GPC_OBJECT_DELIMITER
-GPC_PROPERTY_NAMELEN
 <TITLE>GladePropertyDef</TITLE>
 GladePropertyDef
 glade_property_def_new
@@ -443,6 +440,7 @@ glade_property_def_themed_icon
 glade_property_def_transfer_on_paste
 glade_property_def_translatable
 glade_property_def_weight
+GLADE_PROPERTY_DEF_OBJECT_DELIMITER
 <SUBSECTION Standard>
 GLADE_TYPE_PROPERTY_DEF
 glade_property_def_get_type
@@ -1133,7 +1131,7 @@ GladePreviewerPrivate
 <SECTION>
 <FILE>glade-command</FILE>
 <TITLE>GladeCommand</TITLE>
-GCSetPropData
+GladeCommandSetPropData
 GladeCommand
 glade_command_push_group
 glade_command_pop_group
@@ -1246,7 +1244,7 @@ GLADE_TYPE_UTIL_FILE_DIALOG_TYPE
 GWA_VERSION_CHECK
 GWA_VERSION_SINCE_MAJOR
 GWA_VERSION_SINCE_MINOR
-GPC_VERSION_CHECK
+GLADE_PROPERTY_DEF_VERSION_CHECK
 GSC_VERSION_CHECK
 GWA_DEPRECATED
 GWA_DEPRECATED_SINCE_CHECK
diff --git a/doc/meson.build b/doc/meson.build
index d61ca90f..b3183070 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -15,6 +15,7 @@ private_headers = [
   'glade-palette-item.h',
   'glade-named-icon-chooser-dialog.h',
   'glade-palette-box.h',
+  'glade-private.h',
 ]
 
 content_files = files(
diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c
index abc039bb..cc05fb40 100644
--- a/gladeui/glade-command.c
+++ b/gladeui/glade-command.c
@@ -574,7 +574,7 @@ glade_command_set_property_execute (GladeCommand *cmd)
   for (l = me->sdata; l; l = l->next)
     {
       GValue            new_value = { 0, };
-      GCSetPropData    *sdata = l->data;
+      GladeCommandSetPropData    *sdata = l->data;
       GladePropertyDef *pdef = glade_property_get_def (sdata->property);
       GladeWidget      *widget = glade_property_get_widget (sdata->property);
 
@@ -661,7 +661,7 @@ glade_command_set_property_finalize (GObject *obj)
 
   for (l = me->sdata; l; l = l->next)
     {
-      GCSetPropData *sdata = l->data;
+      GladeCommandSetPropData *sdata = l->data;
 
       if (sdata->property)
         g_object_unref (G_OBJECT (sdata->property));
@@ -686,7 +686,7 @@ glade_command_set_property_unifies (GladeCommand *this_cmd,
 {
   GladeCommandSetProperty *cmd1, *cmd2;
   GladePropertyDef *pdef1, *pdef2;
-  GCSetPropData *pdata1, *pdata2;
+  GladeCommandSetPropData *pdata1, *pdata2;
   GladeWidget *widget1, *widget2;
   GList *list, *l;
 
@@ -755,7 +755,7 @@ glade_command_set_property_collapse (GladeCommand *this_cmd,
                                      GladeCommand *other_cmd)
 {
   GladeCommandSetProperty *cmd1, *cmd2;
-  GCSetPropData *pdata1, *pdata2;
+  GladeCommandSetPropData *pdata1, *pdata2;
   GladePropertyDef *pdef1, *pdef2;
   GList *list, *l;
 
@@ -778,7 +778,7 @@ glade_command_set_property_collapse (GladeCommand *this_cmd,
 
           if (glade_property_def_match (pdef1, pdef2))
             {
-              /* Merge the GCSetPropData structs manually here
+              /* Merge the GladeCommandSetPropData structs manually here
                */
               g_value_copy (pdata2->new_value, pdata1->new_value);
               break;
@@ -798,7 +798,7 @@ glade_command_set_property_collapse (GladeCommand *this_cmd,
 static gchar *
 glade_command_set_property_description (GladeCommandSetProperty *me)
 {
-  GCSetPropData *sdata;
+  GladeCommandSetPropData *sdata;
   gchar *description = NULL;
   gchar *value_name;
   GladePropertyDef *pdef;
@@ -846,7 +846,7 @@ glade_command_set_properties_list (GladeProject *project, GList *props)
 {
   GladeCommandSetProperty *me;
   GladeCommand *cmd;
-  GCSetPropData *sdata;
+  GladeCommandSetPropData *sdata;
   GList *list;
   gboolean success;
   gboolean multiple;
@@ -894,7 +894,7 @@ glade_command_set_properties (GladeProperty *property,
                               const GValue *new_value,
                               ...)
 {
-  GCSetPropData *sdata;
+  GladeCommandSetPropData *sdata;
   GladeProperty *prop;
   GladeWidget   *widget;
   GladeProject  *project;
@@ -905,7 +905,7 @@ glade_command_set_properties (GladeProperty *property,
   g_return_if_fail (GLADE_IS_PROPERTY (property));
 
   /* Add first set */
-  sdata = g_new (GCSetPropData, 1);
+  sdata = g_new (GladeCommandSetPropData, 1);
   sdata->property = property;
   sdata->old_value = g_new0 (GValue, 1);
   sdata->new_value = g_new0 (GValue, 1);
@@ -925,7 +925,7 @@ glade_command_set_properties (GladeProperty *property,
       g_assert (G_IS_VALUE (ovalue));
       g_assert (G_IS_VALUE (nvalue));
 
-      sdata = g_new (GCSetPropData, 1);
+      sdata = g_new (GladeCommandSetPropData, 1);
       sdata->property = g_object_ref (GLADE_PROPERTY (prop));
       sdata->old_value = g_new0 (GValue, 1);
       sdata->new_value = g_new0 (GValue, 1);
diff --git a/gladeui/glade-command.h b/gladeui/glade-command.h
index 7012fb3e..39c86b89 100644
--- a/gladeui/glade-command.h
+++ b/gladeui/glade-command.h
@@ -21,19 +21,20 @@ G_BEGIN_DECLS
 typedef struct _GladeCommand        GladeCommand;
 typedef struct _GladeCommandClass   GladeCommandClass;
 typedef struct _GladeCommandPrivate GladeCommandPrivate;
-typedef struct _GCSetPropData       GCSetPropData;
+
+typedef struct _GladeCommandSetPropData GladeCommandSetPropData;
 
 /**
- * GCSetPropData
+ * GladeCommandSetPropData
  * @property: A #GladeProperty to set
  * @new_value: The new #GValue to assign to @property
  * @old_value: The old #GValue of @property
  *
  * #GladeProperty can be set in a list as one command,
- * for Undo purposes; we store the list of #GCSetPropData with
+ * for Undo purposes; we store the list of #GladeCommandSetPropData with
  * their old and new #GValue.
  */
-struct _GCSetPropData {
+struct _GladeCommandSetPropData {
   GladeProperty *property;
   GValue        *new_value;
   GValue        *old_value;
@@ -114,7 +115,7 @@ void           glade_command_set_properties      (GladeProperty *property,
                                                   ...);
 
 void           glade_command_set_properties_list (GladeProject  *project, 
-                                                  GList         *props); /* list of GCSetPropData */
+                                                  GList         *props); /* list of GladeCommandSetPropData */
 
 /************************** name ******************************/
 
diff --git a/gladeui/glade-editor-table.c b/gladeui/glade-editor-table.c
index 6ab4c9f2..dc380914 100644
--- a/gladeui/glade-editor-table.c
+++ b/gladeui/glade-editor-table.c
@@ -390,7 +390,7 @@ glade_editor_table_load (GladeEditable *editable, GladeWidget *widget)
 
           gtk_widget_set_sensitive (table->priv->composite_check,
                                     !g_str_has_prefix (glade_widget_adaptor_get_name (adaptor),
-                                                       GWA_INSTANTIABLE_PREFIX));
+                                                       GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX));
         }
 
       if (table->priv->name_entry)
diff --git a/gladeui/glade-editor.c b/gladeui/glade-editor.c
index d98c869c..6838a710 100644
--- a/gladeui/glade-editor.c
+++ b/gladeui/glade-editor.c
@@ -1101,7 +1101,7 @@ static void
 glade_editor_reset_properties (GList *props)
 {
   GList *list, *sdata_list = NULL;
-  GCSetPropData *sdata;
+  GladeCommandSetPropData *sdata;
   GladeProperty *prop;
   GladeWidget   *widget;
   GladeProject *project = NULL;
@@ -1112,7 +1112,7 @@ glade_editor_reset_properties (GList *props)
       widget  = glade_property_get_widget (prop);
       project = glade_widget_get_project (widget);
 
-      sdata = g_new (GCSetPropData, 1);
+      sdata = g_new (GladeCommandSetPropData, 1);
       sdata->property = prop;
 
       sdata->old_value = g_new0 (GValue, 1);
diff --git a/gladeui/glade-private.h b/gladeui/glade-private.h
index f2dde177..a190be04 100644
--- a/gladeui/glade-private.h
+++ b/gladeui/glade-private.h
@@ -34,7 +34,7 @@
 
 G_BEGIN_DECLS
 
-#define GWA_INSTANTIABLE_PREFIX_LEN 17
+#define GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX_LEN 17
 
 /* glade-widget.c */
 
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index f723870c..a45905ec 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -1873,7 +1873,7 @@ glade_project_introspect_gtk_version (GladeProject *project)
 
           /* Check GTK+ property class versions */
           if (is_gtk_adaptor &&
-              !GPC_VERSION_CHECK (pdef, target_major, target_minor))
+              !GLADE_PROPERTY_DEF_VERSION_CHECK (pdef, target_major, target_minor))
             {
               target_major = glade_property_def_since_major (pdef);
               target_minor = glade_property_def_since_minor (pdef);
@@ -3168,7 +3168,7 @@ glade_project_verify_property_internal (GladeProject    *project,
                                             &target_major, &target_minor);
 
   if ((flags & GLADE_VERIFY_VERSIONS) != 0 &&
-      !GPC_VERSION_CHECK (pdef, target_major, target_minor))
+      !GLADE_PROPERTY_DEF_VERSION_CHECK (pdef, target_major, target_minor))
     {
       GLADE_NOTE (VERIFY, g_print ("VERIFY: Property '%s' of adaptor %s not available in version %d.%d\n",
                                    glade_property_def_id (pclass),
diff --git a/gladeui/glade-property-def.c b/gladeui/glade-property-def.c
index 7d60b693..76534d56 100644
--- a/gladeui/glade-property-def.c
+++ b/gladeui/glade-property-def.c
@@ -444,7 +444,7 @@ glade_property_def_make_string_from_objects (GladePropertyDef *
       else if (obj_str != NULL)
         {
           tmp =
-              g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER, obj_str);
+              g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER, obj_str);
           string = (g_free (string), tmp);
           g_free (obj_str);
         }
@@ -789,7 +789,7 @@ glade_property_def_make_objects_from_string (GladePropertyDef *
   gchar **split;
   guint i;
 
-  if ((split = g_strsplit (string, GPC_OBJECT_DELIMITER, 0)) != NULL)
+  if ((split = g_strsplit (string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER, 0)) != NULL)
     {
       for (i = 0; split[i]; i++)
         {
diff --git a/gladeui/glade-property-def.h b/gladeui/glade-property-def.h
index 2c5c0b69..7e20ea8e 100644
--- a/gladeui/glade-property-def.h
+++ b/gladeui/glade-property-def.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
    ((type) == GLADE_PAGE_QUERY   && glade_property_def_query (gpc)))
 
 /**
- * GPC_VERSION_CHECK:
+ * GLADE_PROPERTY_DEF_VERSION_CHECK:
  * @def: A #GladePropertyDef
  * @major_version: The major version to check
  * @minor_version: The minor version to check
@@ -44,14 +44,13 @@ G_BEGIN_DECLS
  * Evaluates to %TRUE if @def is available in its owning library version-@major_verion.@minor_version.
  *
  */
-#define GPC_VERSION_CHECK(def, major_version, minor_version)                          \
+#define GLADE_PROPERTY_DEF_VERSION_CHECK(def, major_version, minor_version)       \
   ((glade_property_def_since_major (GLADE_PROPERTY_DEF (def)) == major_version) ? \
    (glade_property_def_since_minor (GLADE_PROPERTY_DEF (def)) <= minor_version) : \
    (glade_property_def_since_major (GLADE_PROPERTY_DEF (def)) <= major_version))
 
 
-#define GPC_OBJECT_DELIMITER ", "
-#define GPC_PROPERTY_NAMELEN 512  /* Enough space for a property name I think */
+#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER ", "
 
 typedef struct _GladePropertyDef GladePropertyDef;
 
diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c
index dfc29d5a..0cf722ad 100644
--- a/gladeui/glade-widget-adaptor.c
+++ b/gladeui/glade-widget-adaptor.c
@@ -1779,15 +1779,15 @@ glade_widget_adaptor_get_name (GladeWidgetAdaptor *adaptor)
  * glade_widget_adaptor_get_display_name
  * @adaptor: a #GladeWidgetAdaptor
  *
- * Returns: the name of the adaptor without %GWA_INSTANTIABLE_PREFIX
+ * Returns: the name of the adaptor without %GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX
  */
 G_CONST_RETURN gchar *
 glade_widget_adaptor_get_display_name (GladeWidgetAdaptor *adaptor)
 {
   g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
 
-  if (g_str_has_prefix (adaptor->priv->name, GWA_INSTANTIABLE_PREFIX))
-    return &adaptor->priv->name[GWA_INSTANTIABLE_PREFIX_LEN];
+  if (g_str_has_prefix (adaptor->priv->name, GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX))
+    return &adaptor->priv->name[GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX_LEN];
 
   return adaptor->priv->name;
 }
diff --git a/gladeui/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h
index e90affb4..376edb0d 100644
--- a/gladeui/glade-widget-adaptor.h
+++ b/gladeui/glade-widget-adaptor.h
@@ -177,11 +177,11 @@ typedef struct _GladeWidgetAdaptorClass   GladeWidgetAdaptorClass;
 #define GLADE_VALID_CREATE_REASON(reason) (reason >= 0 && reason < GLADE_CREATE_REASONS)
 
 /**
- * GWA_INSTANTIABLE_PREFIX:
+ * GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX:
  *
  * Class prefix used for abstract classes (ie GtkBin -> GladeInstantiableGtkBin)
  */
-#define GWA_INSTANTIABLE_PREFIX "GladeInstantiable"
+#define GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX "GladeInstantiable"
 
 /**
  * GladeCreateReason:
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 646c9558..4c11aa2b 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -954,7 +954,7 @@ glade_widget_constructor (GType                  type,
   glade_widget_verify (gwidget);
 
   if (g_str_has_prefix (glade_widget_adaptor_get_name (gwidget->priv->adaptor),
-                        GWA_INSTANTIABLE_PREFIX))
+                        GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX))
     glade_widget_set_is_composite (gwidget, TRUE);
 
   return ret_obj;
@@ -4109,7 +4109,7 @@ glade_widget_read (GladeProject *project,
           /* Check if there is an instantiable version for this abstract class */
           if (G_TYPE_IS_ABSTRACT (template_type))
             {
-              gchar *instantiable = g_strconcat (GWA_INSTANTIABLE_PREFIX,
+              gchar *instantiable = g_strconcat (GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX,
                                                  template_parent,
                                                  NULL);
               if (glade_util_get_type_from_name (instantiable, FALSE))
diff --git a/plugins/gladeui/glade-glade-editor-skeleton.c b/plugins/gladeui/glade-glade-editor-skeleton.c
index 77a047a9..b8a7cddf 100644
--- a/plugins/gladeui/glade-glade-editor-skeleton.c
+++ b/plugins/gladeui/glade-glade-editor-skeleton.c
@@ -59,7 +59,7 @@ glade_glade_editor_skeleton_read_widget (GladeWidgetAdaptor *adaptor,
           else if (widget_name != NULL)
             {
               tmp =
-                  g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
+                  g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
                                    widget_name);
               string = (g_free (string), tmp);
               g_free (widget_name);
diff --git a/plugins/gtk+/glade-gtk-box.c b/plugins/gtk+/glade-gtk-box.c
index 2a6ea644..8d11148a 100644
--- a/plugins/gtk+/glade-gtk-box.c
+++ b/plugins/gtk+/glade-gtk-box.c
@@ -812,7 +812,7 @@ glade_gtk_box_configure_end (GladeFixed * fixed,
 
           if (bchild == gbchild->widget)
             {
-              GCSetPropData *prop_data = g_new0 (GCSetPropData, 1);
+              GladeCommandSetPropData *prop_data = g_new0 (GladeCommandSetPropData, 1);
               prop_data->property =
                   glade_widget_get_pack_property (gchild, "position");
 
diff --git a/plugins/gtk+/glade-gtk-button.c b/plugins/gtk+/glade-gtk-button.c
index f5e691e9..173db40d 100644
--- a/plugins/gtk+/glade-gtk-button.c
+++ b/plugins/gtk+/glade-gtk-button.c
@@ -238,7 +238,7 @@ glade_gtk_button_set_property (GladeWidgetAdaptor *adaptor,
                                                         id, value);
       glade_gtk_sync_use_appearance (widget);
     }
-  else if (GPC_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
+  else if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 
   /* GtkLockButton hides itself after setting a property so we need to make sure
diff --git a/plugins/gtk+/glade-gtk-entry-buffer.c b/plugins/gtk+/glade-gtk-entry-buffer.c
index bdb5f219..d5c09dc5 100644
--- a/plugins/gtk+/glade-gtk-entry-buffer.c
+++ b/plugins/gtk+/glade-gtk-entry-buffer.c
@@ -83,7 +83,7 @@ glade_gtk_entry_buffer_set_property (GladeWidgetAdaptor * adaptor,
                                          gwidget);
 
     }
-  else if (GPC_VERSION_CHECK
+  else if (GLADE_PROPERTY_DEF_VERSION_CHECK
            (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-entry.c b/plugins/gtk+/glade-gtk-entry.c
index 3c2813ee..348e1d0e 100644
--- a/plugins/gtk+/glade-gtk-entry.c
+++ b/plugins/gtk+/glade-gtk-entry.c
@@ -210,7 +210,7 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor *adaptor,
 
       GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
     }
-  else if (GPC_VERSION_CHECK
+  else if (GLADE_PROPERTY_DEF_VERSION_CHECK
            (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value);
 }
@@ -246,7 +246,7 @@ glade_gtk_entry_read_widget (GladeWidgetAdaptor *adaptor,
       property = glade_widget_get_property (widget, "buffer");
 
       /* Only default to the buffer setting if the project version supports it. */
-      if (GPC_VERSION_CHECK (glade_property_get_def (property), target_major, target_minor))
+      if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), target_major, target_minor))
         {
           glade_widget_property_set (widget, "use-entry-buffer", TRUE);
           glade_property_sync (property);
diff --git a/plugins/gtk+/glade-gtk-menu-item.c b/plugins/gtk+/glade-gtk-menu-item.c
index 30167ebb..5d627aa6 100644
--- a/plugins/gtk+/glade-gtk-menu-item.c
+++ b/plugins/gtk+/glade-gtk-menu-item.c
@@ -222,7 +222,7 @@ glade_gtk_menu_item_set_property (GladeWidgetAdaptor *adaptor,
     glade_gtk_menu_item_set_use_underline (object, value);
   else if (!strcmp (id, "label"))
     glade_gtk_menu_item_set_label (object, value);
-  else if (GPC_VERSION_CHECK
+  else if (GLADE_PROPERTY_DEF_VERSION_CHECK
            (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
                                                       value);
diff --git a/plugins/gtk+/glade-gtk-progress-bar.c b/plugins/gtk+/glade-gtk-progress-bar.c
index 4297bbb9..b2ecbd20 100644
--- a/plugins/gtk+/glade-gtk-progress-bar.c
+++ b/plugins/gtk+/glade-gtk-progress-bar.c
@@ -64,6 +64,6 @@ glade_gtk_progress_bar_set_property (GladeWidgetAdaptor *adaptor,
         }
     }
 
-  if (GPC_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
+  if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-recent-chooser-menu.c b/plugins/gtk+/glade-gtk-recent-chooser-menu.c
index 2bf3be35..a4ed7d79 100644
--- a/plugins/gtk+/glade-gtk-recent-chooser-menu.c
+++ b/plugins/gtk+/glade-gtk-recent-chooser-menu.c
@@ -46,6 +46,6 @@ glade_gtk_recent_chooser_menu_set_property (GladeWidgetAdaptor *adaptor,
   GladeWidget *widget = glade_widget_get_from_gobject (object);
   GladeProperty *property = glade_widget_get_property (widget, id);
 
-  if (GPC_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
+  if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_MENU)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-scale.c b/plugins/gtk+/glade-gtk-scale.c
index 23dd7cd8..f788296b 100644
--- a/plugins/gtk+/glade-gtk-scale.c
+++ b/plugins/gtk+/glade-gtk-scale.c
@@ -64,6 +64,6 @@ glade_gtk_scale_set_property (GladeWidgetAdaptor *adaptor,
         }
     }
 
-  if (GPC_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
+  if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-scrolled-window.c b/plugins/gtk+/glade-gtk-scrolled-window.c
index 302b12c2..2e87487a 100644
--- a/plugins/gtk+/glade-gtk-scrolled-window.c
+++ b/plugins/gtk+/glade-gtk-scrolled-window.c
@@ -56,7 +56,7 @@ glade_gtk_scrolled_window_set_property (GladeWidgetAdaptor *adaptor,
         glade_widget_property_set_sensitive (widget, "window-placement", FALSE,
                                              _("This property is disabled"));
     }
-  else if (GPC_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
+  else if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
 
diff --git a/plugins/gtk+/glade-gtk-size-group.c b/plugins/gtk+/glade-gtk-size-group.c
index 3b312bc5..925ecf6b 100644
--- a/plugins/gtk+/glade-gtk-size-group.c
+++ b/plugins/gtk+/glade-gtk-size-group.c
@@ -56,7 +56,7 @@ glade_gtk_size_group_read_widgets (GladeWidget *widget, GladeXmlNode *node)
           else if (widget_name != NULL)
             {
               tmp =
-                  g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
+                  g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
                                    widget_name);
               string = (g_free (string), tmp);
               g_free (widget_name);
diff --git a/plugins/gtk+/glade-gtk-text-buffer.c b/plugins/gtk+/glade-gtk-text-buffer.c
index 0886de5f..2450a07b 100644
--- a/plugins/gtk+/glade-gtk-text-buffer.c
+++ b/plugins/gtk+/glade-gtk-text-buffer.c
@@ -79,7 +79,7 @@ glade_gtk_text_buffer_set_property (GladeWidgetAdaptor * adaptor,
                                          gwidget);
 
     }
-  else if (GPC_VERSION_CHECK
+  else if (GLADE_PROPERTY_DEF_VERSION_CHECK
            (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-tool-item.c b/plugins/gtk+/glade-gtk-tool-item.c
index 859613e2..aefda410 100644
--- a/plugins/gtk+/glade-gtk-tool-item.c
+++ b/plugins/gtk+/glade-gtk-tool-item.c
@@ -66,7 +66,7 @@ glade_gtk_tool_item_set_property (GladeWidgetAdaptor *adaptor,
   GladeWidget *gwidget = glade_widget_get_from_gobject (object);
   GladeProperty *property = glade_widget_get_property (gwidget, id);
 
-  if (GPC_VERSION_CHECK
+  if (GLADE_PROPERTY_DEF_VERSION_CHECK
       (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id,
                                                       value);
diff --git a/plugins/gtk+/glade-gtk-tree-view.c b/plugins/gtk+/glade-gtk-tree-view.c
index c800d72b..a14498ea 100644
--- a/plugins/gtk+/glade-gtk-tree-view.c
+++ b/plugins/gtk+/glade-gtk-tree-view.c
@@ -306,6 +306,6 @@ glade_gtk_treeview_set_property (GladeWidgetAdaptor *adaptor,
         glade_widget_property_set_sensitive (widget, "expander-column", FALSE, _("Expanders are not shown"));
     }
 
-  if (GPC_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
+  if (GLADE_PROPERTY_DEF_VERSION_CHECK (glade_property_get_def (property), gtk_major_version, gtk_minor_version + 1))
     GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
 }
diff --git a/plugins/gtk+/glade-gtk-widget.c b/plugins/gtk+/glade-gtk-widget.c
index 84097d17..9bcfcd82 100644
--- a/plugins/gtk+/glade-gtk-widget.c
+++ b/plugins/gtk+/glade-gtk-widget.c
@@ -120,7 +120,7 @@ glade_gtk_parse_atk_relation (GladeProperty *property, GladeXmlNode *node)
           else
             {
               tmp = g_strdup_printf ("%s%s%s", string,
-                                     GPC_OBJECT_DELIMITER, target);
+                                     GLADE_PROPERTY_DEF_OBJECT_DELIMITER, target);
               string = (g_free (string), tmp);
             }
 
@@ -445,7 +445,7 @@ glade_gtk_widget_write_atk_relation (GladeProperty   *property,
        (glade_property_def_get_adaptor (glade_property_get_def (property)),
         glade_property_get_def (property), glade_property_inline_value (property))) != NULL)
     {
-      if ((split = g_strsplit (value, GPC_OBJECT_DELIMITER, 0)) != NULL)
+      if ((split = g_strsplit (value, GLADE_PROPERTY_DEF_OBJECT_DELIMITER, 0)) != NULL)
         {
           for (i = 0; split[i] != NULL; i++)
             {
@@ -800,7 +800,7 @@ create_command_property_list (GladeWidget *gnew, GList *saved_props)
       GladePropertyDef *pdef = glade_property_get_def (property);
       GladeProperty *orig_prop =
         glade_widget_get_pack_property (gnew, glade_property_def_id (pdef));
-      GCSetPropData *pdata = g_new0 (GCSetPropData, 1);
+      GladeCommandSetPropData *pdata = g_new0 (GladeCommandSetPropData, 1);
 
       pdata->property = orig_prop;
       pdata->old_value = g_new0 (GValue, 1);
diff --git a/plugins/gtk+/glade-gtk-window.c b/plugins/gtk+/glade-gtk-window.c
index 53604a90..5daa30b6 100644
--- a/plugins/gtk+/glade-gtk-window.c
+++ b/plugins/gtk+/glade-gtk-window.c
@@ -121,7 +121,7 @@ glade_gtk_window_read_accel_groups (GladeWidget *widget, GladeXmlNode *node)
           else if (group_name != NULL)
             {
               tmp =
-                  g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
+                  g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
                                    group_name);
               string = (g_free (string), tmp);
               g_free (group_name);