gladeui: Use G_DECLARE_INTERFACE for GladeEditable

30 files changed, 94 insertions, 105 deletions

diff --git a/doc/gladeui-sections.txt b/doc/gladeui-sections.txt
index da1c47b7..79baa1e3 100644
--- a/doc/gladeui-sections.txt
+++ b/doc/gladeui-sections.txt
@@ -863,7 +863,6 @@ glade_signal_editor_get_type
 <FILE>glade-editable</FILE>
 <TITLE>GladeEditable</TITLE>
 GladeEditable
-GladeEditableIface
 GladeEditableInterface
 glade_editable_block
 glade_editable_load
diff --git a/gladeui/glade-editable.c b/gladeui/glade-editable.c
index dfad7aee..de345eec 100644
--- a/gladeui/glade-editable.c
+++ b/gladeui/glade-editable.c
@@ -104,7 +104,7 @@ glade_editable_load_default (GladeEditable  *editable,
 }
 
 static void
-glade_editable_default_init (GladeEditableIface *iface)
+glade_editable_default_init (GladeEditableInterface *iface)
 {
   glade_editable_project_quark = g_quark_from_static_string ("glade-editable-project-quark");
   glade_editable_widget_quark  = g_quark_from_static_string ("glade-editable-widget-quark");
@@ -126,7 +126,7 @@ glade_editable_default_init (GladeEditableIface *iface)
 void
 glade_editable_load (GladeEditable *editable, GladeWidget *widget)
 {
-  GladeEditableIface *iface;
+  GladeEditableInterface *iface;
   g_return_if_fail (GLADE_IS_EDITABLE (editable));
   g_return_if_fail (widget == NULL || GLADE_IS_WIDGET (widget));
 
@@ -165,7 +165,7 @@ glade_editable_load (GladeEditable *editable, GladeWidget *widget)
 void
 glade_editable_set_show_name (GladeEditable *editable, gboolean show_name)
 {
-  GladeEditableIface *iface;
+  GladeEditableInterface *iface;
   g_return_if_fail (GLADE_IS_EDITABLE (editable));
 
   iface = GLADE_EDITABLE_GET_IFACE (editable);
diff --git a/gladeui/glade-editable.h b/gladeui/glade-editable.h
index f578ebe3..509a6931 100644
--- a/gladeui/glade-editable.h
+++ b/gladeui/glade-editable.h
@@ -6,16 +6,8 @@
 
 G_BEGIN_DECLS
 
-#define GLADE_TYPE_EDITABLE            (glade_editable_get_type ())
-#define GLADE_EDITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_EDITABLE, GladeEditable))
-#define GLADE_EDITABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GLADE_TYPE_EDITABLE, GladeEditableInterface))
-#define GLADE_IS_EDITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_EDITABLE))
-#define GLADE_EDITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GLADE_TYPE_EDITABLE, GladeEditableInterface))
-
-
-typedef struct _GladeEditable      GladeEditable; /* Dummy typedef */
-typedef struct _GladeEditableIface GladeEditableInterface; /* used by G_DEFINE_INTERFACE */
-typedef struct _GladeEditableIface GladeEditableIface; /* keep this symbol for binary compatibility */
+#define GLADE_TYPE_EDITABLE glade_editable_get_type ()
+G_DECLARE_INTERFACE (GladeEditable, glade_editable, GLADE, EDITABLE, GtkWidget)
 
 typedef enum
 {
@@ -28,7 +20,7 @@ typedef enum
 } GladeEditorPageType;
 
 
-struct _GladeEditableIface
+struct _GladeEditableInterface
 {
   GTypeInterface g_iface;
 
@@ -39,8 +31,6 @@ struct _GladeEditableIface
                                    gboolean        show_name);
 };
 
-GType        glade_editable_get_type       (void) G_GNUC_CONST;
-
 void         glade_editable_load           (GladeEditable *editable,
                                             GladeWidget   *widget);
 void         glade_editable_set_show_name  (GladeEditable *editable,
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index 4a15fb76..657beff0 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -111,9 +111,9 @@ struct _GladeEditorPropertyPrivate
   guint               disable_check : 1; /* Whether to explicitly disable the optional check button */
 };
 
-static void glade_editor_property_editable_init (GladeEditableIface *iface);
+static void glade_editor_property_editable_init (GladeEditableInterface *iface);
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeEditorProperty, glade_editor_property, GTK_TYPE_BOX,
                          G_ADD_PRIVATE (GladeEditorProperty)
@@ -122,7 +122,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeEditorProperty, glade_editor_property, GTK_TYPE_BO
 
 
 /*******************************************************************************
- *                            GladeEditableIface                               *                               
+ *                          GladeEditableInterface                             *
  *******************************************************************************/
 static void
 glade_editor_property_editable_load (GladeEditable   *editable,
@@ -140,7 +140,7 @@ glade_editor_property_set_show_name (GladeEditable *editable, gboolean show_name
 }
 
 static void
-glade_editor_property_editable_init (GladeEditableIface *iface)
+glade_editor_property_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/gladeui/glade-editor-skeleton.c b/gladeui/glade-editor-skeleton.c
index 3dd4c491..1d987b1d 100644
--- a/gladeui/glade-editor-skeleton.c
+++ b/gladeui/glade-editor-skeleton.c
@@ -34,8 +34,8 @@
 /* GObjectClass */
 static void      glade_editor_skeleton_dispose        (GObject *object);
 
-/* GladeEditableIface */
-static void      glade_editor_skeleton_editable_init   (GladeEditableIface *iface);
+/* GladeEditableInterface */
+static void      glade_editor_skeleton_editable_init   (GladeEditableInterface *iface);
 
 /* GtkBuildableIface */
 static void      glade_editor_skeleton_buildable_init  (GtkBuildableIface *iface);
@@ -47,7 +47,7 @@ struct _GladeEditorSkeletonPrivate
   GSList *editors;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 static GtkBuildableIface  *parent_buildable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeEditorSkeleton, glade_editor_skeleton, GTK_TYPE_BOX,
@@ -90,7 +90,7 @@ glade_editor_skeleton_dispose (GObject *object)
 }
 
 /*******************************************************************************
- *                            GladeEditableIface                               *                               
+ *                          GladeEditableInterface                             *
  *******************************************************************************/
 static void
 glade_editor_skeleton_load (GladeEditable *editable,
@@ -127,7 +127,7 @@ glade_editor_skeleton_set_show_name (GladeEditable *editable, gboolean show_name
 }
 
 static void
-glade_editor_skeleton_editable_init (GladeEditableIface *iface)
+glade_editor_skeleton_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/gladeui/glade-editor-table.c b/gladeui/glade-editor-table.c
index ac216c02..d03d4aee 100644
--- a/gladeui/glade-editor-table.c
+++ b/gladeui/glade-editor-table.c
@@ -51,7 +51,7 @@ static void glade_editor_table_set_property  (GObject      *object,
                                               const GValue *value,
                                               GParamSpec   *pspec);
 
-static void glade_editor_table_editable_init (GladeEditableIface *iface);
+static void glade_editor_table_editable_init (GladeEditableInterface *iface);
 static void glade_editor_table_realize       (GtkWidget *widget);
 static void glade_editor_table_grab_focus    (GtkWidget *widget);
 
@@ -447,7 +447,7 @@ glade_editor_table_set_show_name (GladeEditable *editable, gboolean show_name)
 }
 
 static void
-glade_editor_table_editable_init (GladeEditableIface *iface)
+glade_editor_table_editable_init (GladeEditableInterface *iface)
 {
   iface->load = glade_editor_table_load;
   iface->set_show_name = glade_editor_table_set_show_name;
diff --git a/gladeui/glade-property-label.c b/gladeui/glade-property-label.c
index 06e995f6..3f1b4259 100644
--- a/gladeui/glade-property-label.c
+++ b/gladeui/glade-property-label.c
@@ -47,8 +47,8 @@ static void      glade_property_label_get_real_property (GObject         *object
 static gint      glade_property_label_button_press      (GtkWidget       *widget,
                                                          GdkEventButton  *event);
 
-/* GladeEditableIface */
-static void      glade_property_label_editable_init     (GladeEditableIface *iface);
+/* GladeEditableInterface */
+static void      glade_property_label_editable_init     (GladeEditableInterface *iface);
 
 struct _GladePropertyLabelPrivate
 {
@@ -81,7 +81,7 @@ enum {
   PROP_CUSTOM_TOOLTIP,
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladePropertyLabel, glade_property_label, GTK_TYPE_EVENT_BOX,
                          G_ADD_PRIVATE (GladePropertyLabel)
@@ -259,7 +259,7 @@ glade_property_label_get_real_property (GObject    *object,
 }
 
 /*******************************************************************************
- *                            GladeEditableIface                               *                               
+ *                          GladeEditableInterface                             *
  *******************************************************************************/
 static void
 glade_property_label_load (GladeEditable *editable,
@@ -295,7 +295,7 @@ glade_property_label_set_show_name (GladeEditable *editable, gboolean show_name)
 }
 
 static void
-glade_property_label_editable_init (GladeEditableIface *iface)
+glade_property_label_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/gladeui/glade-property-shell.c b/gladeui/glade-property-shell.c
index 7d4c2269..a7fec340 100644
--- a/gladeui/glade-property-shell.c
+++ b/gladeui/glade-property-shell.c
@@ -43,8 +43,8 @@ static void      glade_property_shell_get_real_property (GObject       *object,
                                                          GValue        *value,
                                                          GParamSpec    *pspec);
 
-/* GladeEditableIface */
-static void      glade_property_shell_editable_init     (GladeEditableIface *iface);
+/* GladeEditableInterface */
+static void      glade_property_shell_editable_init     (GladeEditableInterface *iface);
 
 struct _GladePropertyShellPrivate
 {
@@ -82,7 +82,7 @@ enum
 
 static guint glade_property_shell_signals[LAST_SIGNAL] = { 0, };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladePropertyShell, glade_property_shell, GTK_TYPE_BOX,
                          G_ADD_PRIVATE (GladePropertyShell)
@@ -270,7 +270,7 @@ glade_property_shell_get_real_property (GObject    *object,
 }
 
 /*******************************************************************************
- *                            GladeEditableIface                               *                               
+ *                          GladeEditableInterface                             *
  *******************************************************************************/
 static void
 propagate_pre_commit (GladeEditorProperty *property,
@@ -412,7 +412,7 @@ glade_property_shell_set_show_name (GladeEditable *editable, gboolean show_name)
 }
 
 static void
-glade_property_shell_editable_init (GladeEditableIface *iface)
+glade_property_shell_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/plugins/gtk+/glade-about-dialog-editor.c b/plugins/gtk+/glade-about-dialog-editor.c
index 9aba7162..cfc4fe1a 100644
--- a/plugins/gtk+/glade-about-dialog-editor.c
+++ b/plugins/gtk+/glade-about-dialog-editor.c
@@ -25,7 +25,7 @@
 
 #include "glade-about-dialog-editor.h"
 
-static void glade_about_dialog_editor_editable_init (GladeEditableIface *iface);
+static void glade_about_dialog_editor_editable_init (GladeEditableInterface *iface);
 
 /* Callbacks */
 static void license_type_pre_commit     (GladePropertyShell     *shell,
@@ -50,7 +50,7 @@ struct _GladeAboutDialogEditorPrivate
   GtkWidget *logo_icon_radio;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeAboutDialogEditor, glade_about_dialog_editor, GLADE_TYPE_WINDOW_EDITOR,
                          G_ADD_PRIVATE (GladeAboutDialogEditor)
@@ -121,7 +121,7 @@ glade_about_dialog_editor_load (GladeEditable *editable, GladeWidget *widget)
 }
 
 static void
-glade_about_dialog_editor_editable_init (GladeEditableIface *iface)
+glade_about_dialog_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-action-bar-editor.c b/plugins/gtk+/glade-action-bar-editor.c
index 56ae344a..b75e2434 100644
--- a/plugins/gtk+/glade-action-bar-editor.c
+++ b/plugins/gtk+/glade-action-bar-editor.c
@@ -26,7 +26,7 @@
 
 #include "glade-action-bar-editor.h"
 
-static void glade_action_bar_editor_editable_init (GladeEditableIface * iface);
+static void glade_action_bar_editor_editable_init (GladeEditableInterface * iface);
 static void glade_action_bar_editor_grab_focus (GtkWidget * widget);
 static void use_center_child_toggled (GtkWidget *widget, GladeActionBarEditor * box_editor);
 
@@ -37,7 +37,7 @@ struct _GladeActionBarEditorPrivate
   GtkWidget *use_center_child;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeActionBarEditor, glade_action_bar_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeActionBarEditor)
@@ -91,7 +91,7 @@ glade_action_bar_editor_load (GladeEditable *editable,
 }
 
 static void
-glade_action_bar_editor_editable_init (GladeEditableIface * iface)
+glade_action_bar_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
   iface->load = glade_action_bar_editor_load;
diff --git a/plugins/gtk+/glade-action-editor.c b/plugins/gtk+/glade-action-editor.c
index d2971b78..cc78fac8 100644
--- a/plugins/gtk+/glade-action-editor.c
+++ b/plugins/gtk+/glade-action-editor.c
@@ -25,7 +25,7 @@
 
 #include "glade-action-editor.h"
 
-static void glade_action_editor_editable_init (GladeEditableIface * iface);
+static void glade_action_editor_editable_init (GladeEditableInterface * iface);
 static void glade_action_editor_grab_focus (GtkWidget * widget);
 
 struct _GladeActionEditorPrivate {
@@ -42,7 +42,7 @@ struct _GladeActionEditorPrivate {
   GtkWidget *radio_value_editor;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeActionEditor, glade_action_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeActionEditor)
@@ -115,7 +115,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
-glade_action_editor_editable_init (GladeEditableIface * iface)
+glade_action_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-activatable-editor.c b/plugins/gtk+/glade-activatable-editor.c
index dacc65a7..add16fb4 100644
--- a/plugins/gtk+/glade-activatable-editor.c
+++ b/plugins/gtk+/glade-activatable-editor.c
@@ -25,7 +25,7 @@
 
 #include "glade-activatable-editor.h"
 
-static void glade_activatable_editor_editable_init (GladeEditableIface * iface);
+static void glade_activatable_editor_editable_init (GladeEditableInterface * iface);
 static void glade_activatable_editor_grab_focus (GtkWidget * widget);
 
 struct _GladeActivatableEditorPrivate {
@@ -35,7 +35,7 @@ struct _GladeActivatableEditorPrivate {
   GtkWidget *action_name_editor;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeActivatableEditor, glade_activatable_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeActivatableEditor)
@@ -96,7 +96,7 @@ glade_activatable_editor_load (GladeEditable *editable,
 }
 
 static void
-glade_activatable_editor_editable_init (GladeEditableIface * iface)
+glade_activatable_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-box-editor.c b/plugins/gtk+/glade-box-editor.c
index a34f62be..d4257656 100644
--- a/plugins/gtk+/glade-box-editor.c
+++ b/plugins/gtk+/glade-box-editor.c
@@ -26,7 +26,7 @@
 
 #include "glade-box-editor.h"
 
-static void glade_box_editor_editable_init (GladeEditableIface * iface);
+static void glade_box_editor_editable_init (GladeEditableInterface * iface);
 static void glade_box_editor_grab_focus (GtkWidget * widget);
 static void use_center_child_toggled (GtkWidget *widget, GladeBoxEditor * box_editor);
 
@@ -37,7 +37,7 @@ struct _GladeBoxEditorPrivate
   GtkWidget *use_center_child;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeBoxEditor, glade_box_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeBoxEditor)
@@ -95,7 +95,7 @@ glade_box_editor_load (GladeEditable *editable,
 }
 
 static void
-glade_box_editor_editable_init (GladeEditableIface * iface)
+glade_box_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-button-editor.c b/plugins/gtk+/glade-button-editor.c
index 28aac595..66688515 100644
--- a/plugins/gtk+/glade-button-editor.c
+++ b/plugins/gtk+/glade-button-editor.c
@@ -26,7 +26,7 @@
 
 #include "glade-button-editor.h"
 
-static void glade_button_editor_editable_init (GladeEditableIface * iface);
+static void glade_button_editor_editable_init (GladeEditableInterface * iface);
 
 static void glade_button_editor_grab_focus (GtkWidget * widget);
 
@@ -72,7 +72,7 @@ struct _GladeButtonEditorPrivate
                               */
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeButtonEditor, glade_button_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeButtonEditor)
@@ -205,7 +205,7 @@ glade_button_editor_load (GladeEditable * editable, GladeWidget * widget)
 }
 
 static void
-glade_button_editor_editable_init (GladeEditableIface * iface)
+glade_button_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-cell-renderer-editor.c b/plugins/gtk+/glade-cell-renderer-editor.c
index 23df948e..5bedf86e 100644
--- a/plugins/gtk+/glade-cell-renderer-editor.c
+++ b/plugins/gtk+/glade-cell-renderer-editor.c
@@ -30,7 +30,7 @@
 
 static void glade_cell_renderer_editor_finalize (GObject * object);
 
-static void glade_cell_renderer_editor_editable_init (GladeEditableIface *
+static void glade_cell_renderer_editor_editable_init (GladeEditableInterface *
                                                       iface);
 
 static void glade_cell_renderer_editor_grab_focus (GtkWidget * widget);
@@ -51,7 +51,7 @@ typedef struct
   GtkWidget *use_attr_eprop;
 } CheckTab;
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeCellRendererEditor, glade_cell_renderer_editor,
                          GTK_TYPE_BOX,
@@ -134,7 +134,7 @@ glade_cell_renderer_editor_set_show_name (GladeEditable * editable,
 }
 
 static void
-glade_cell_renderer_editor_editable_init (GladeEditableIface * iface)
+glade_cell_renderer_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/plugins/gtk+/glade-entry-editor.c b/plugins/gtk+/glade-entry-editor.c
index 31223e7f..f6b20326 100644
--- a/plugins/gtk+/glade-entry-editor.c
+++ b/plugins/gtk+/glade-entry-editor.c
@@ -27,7 +27,7 @@
 #include "glade-entry-editor.h"
 #include "glade-image-editor.h" // For GladeImageEditMode
 
-static void glade_entry_editor_editable_init (GladeEditableIface *iface);
+static void glade_entry_editor_editable_init (GladeEditableInterface *iface);
 static void glade_entry_editor_grab_focus    (GtkWidget          *widget);
 
 /* Callbacks */
@@ -78,7 +78,7 @@ struct _GladeEntryEditorPrivate
 #define TOOLTIP_TEXT_NAME(primary)    ((primary) ? "primary-icon-tooltip-text"    : "secondary-icon-tooltip-text")
 #define TOOLTIP_CONTROL_NAME(primary) ((primary) ? "glade-primary-tooltip-markup" : "glade-secondary-tooltip-markup")
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeEntryEditor, glade_entry_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeEntryEditor)
@@ -212,7 +212,7 @@ glade_entry_editor_set_show_name (GladeEditable * editable, gboolean show_name)
 }
 
 static void
-glade_entry_editor_editable_init (GladeEditableIface * iface)
+glade_entry_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-header-bar-editor.c b/plugins/gtk+/glade-header-bar-editor.c
index db36388d..92ec7ce4 100644
--- a/plugins/gtk+/glade-header-bar-editor.c
+++ b/plugins/gtk+/glade-header-bar-editor.c
@@ -26,7 +26,7 @@
 
 #include "glade-header-bar-editor.h"
 
-static void glade_header_bar_editor_editable_init (GladeEditableIface * iface);
+static void glade_header_bar_editor_editable_init (GladeEditableInterface * iface);
 static void glade_header_bar_editor_grab_focus    (GtkWidget          * widget);
 
 static void use_custom_title_toggled (GtkWidget *widget, GladeHeaderBarEditor * editor);
@@ -39,7 +39,7 @@ struct _GladeHeaderBarEditorPrivate
   GtkWidget *show_decoration_check;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeHeaderBarEditor, glade_header_bar_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeHeaderBarEditor)
@@ -99,7 +99,7 @@ glade_header_bar_editor_load (GladeEditable *editable,
 }
 
 static void
-glade_header_bar_editor_editable_init (GladeEditableIface * iface)
+glade_header_bar_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-icon-factory-editor.c b/plugins/gtk+/glade-icon-factory-editor.c
index 620426ea..841bb96f 100644
--- a/plugins/gtk+/glade-icon-factory-editor.c
+++ b/plugins/gtk+/glade-icon-factory-editor.c
@@ -29,12 +29,12 @@
 
 static void glade_icon_factory_editor_finalize (GObject *object);
 
-static void glade_icon_factory_editor_editable_init (GladeEditableIface *
+static void glade_icon_factory_editor_editable_init (GladeEditableInterface *
                                                      iface);
 
 static void glade_icon_factory_editor_grab_focus (GtkWidget *widget);
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeIconFactoryEditor, glade_icon_factory_editor,
                          GTK_TYPE_BOX,
@@ -88,7 +88,7 @@ glade_icon_factory_editor_set_show_name (GladeEditable *editable,
 }
 
 static void
-glade_icon_factory_editor_editable_init (GladeEditableIface *iface)
+glade_icon_factory_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/plugins/gtk+/glade-image-editor.c b/plugins/gtk+/glade-image-editor.c
index 048fef4d..284575f5 100644
--- a/plugins/gtk+/glade-image-editor.c
+++ b/plugins/gtk+/glade-image-editor.c
@@ -26,7 +26,7 @@
 
 #include "glade-image-editor.h"
 
-static void glade_image_editor_editable_init (GladeEditableIface * iface);
+static void glade_image_editor_editable_init (GladeEditableInterface * iface);
 static void glade_image_editor_grab_focus (GtkWidget * widget);
 
 static void stock_toggled    (GtkWidget *widget, GladeImageEditor * image_editor);
@@ -44,7 +44,7 @@ struct _GladeImageEditorPrivate
   GtkWidget *file_radio;     /* Create the image from filename (libglade only) */
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeImageEditor, glade_image_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeImageEditor)
@@ -119,7 +119,7 @@ glade_image_editor_load (GladeEditable * editable, GladeWidget * widget)
 }
 
 static void
-glade_image_editor_editable_init (GladeEditableIface * iface)
+glade_image_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-image-item-editor.c b/plugins/gtk+/glade-image-item-editor.c
index f4741bf3..859954e2 100644
--- a/plugins/gtk+/glade-image-item-editor.c
+++ b/plugins/gtk+/glade-image-item-editor.c
@@ -29,11 +29,11 @@
 
 static void glade_image_item_editor_finalize (GObject *object);
 
-static void glade_image_item_editor_editable_init (GladeEditableIface *iface);
+static void glade_image_item_editor_editable_init (GladeEditableInterface *iface);
 
 static void glade_image_item_editor_grab_focus (GtkWidget *widget);
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeImageItemEditor, glade_image_item_editor, GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE,
@@ -121,7 +121,7 @@ glade_image_item_editor_set_show_name (GladeEditable *editable,
 }
 
 static void
-glade_image_item_editor_editable_init (GladeEditableIface *iface)
+glade_image_item_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/plugins/gtk+/glade-label-editor.c b/plugins/gtk+/glade-label-editor.c
index cf44e4a8..0e7b7a13 100644
--- a/plugins/gtk+/glade-label-editor.c
+++ b/plugins/gtk+/glade-label-editor.c
@@ -29,10 +29,10 @@
 /* GtkWidgetClass */
 static void glade_label_editor_grab_focus    (GtkWidget          *widget);
 
-/* GladeEditableIface */
+/* GladeEditableInterface */
 static void glade_label_editor_load          (GladeEditable      *editable,
                                               GladeWidget        *widget);
-static void glade_label_editor_editable_init (GladeEditableIface *iface);
+static void glade_label_editor_editable_init (GladeEditableInterface *iface);
 
 /* Callbacks */
 static void attributes_toggled (GtkWidget *widget, GladeLabelEditor *label_editor);
@@ -58,7 +58,7 @@ struct _GladeLabelEditorPrivate
   GtkWidget *wrap_mode_radio;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeLabelEditor, glade_label_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeLabelEditor)
@@ -176,7 +176,7 @@ glade_label_editor_load (GladeEditable *editable, GladeWidget *widget)
 }
 
 static void
-glade_label_editor_editable_init (GladeEditableIface *iface)
+glade_label_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-notebook-editor.c b/plugins/gtk+/glade-notebook-editor.c
index 59860a50..a228158c 100644
--- a/plugins/gtk+/glade-notebook-editor.c
+++ b/plugins/gtk+/glade-notebook-editor.c
@@ -26,7 +26,7 @@
 
 #include "glade-notebook-editor.h"
 
-static void glade_notebook_editor_editable_init (GladeEditableIface * iface);
+static void glade_notebook_editor_editable_init (GladeEditableInterface * iface);
 static void glade_notebook_editor_grab_focus (GtkWidget * widget);
 static void has_start_action_changed (GObject *object, GParamSpec *pspec, GladeNotebookEditor *editor);
 static void has_end_action_changed (GObject *object, GParamSpec *pspec, GladeNotebookEditor *editor);
@@ -39,7 +39,7 @@ struct _GladeNotebookEditorPrivate
   GtkWidget *action_end_editor;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeNotebookEditor, glade_notebook_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeNotebookEditor)
@@ -97,7 +97,7 @@ glade_notebook_editor_load (GladeEditable * editable, GladeWidget * widget)
 }
 
 static void
-glade_notebook_editor_editable_init (GladeEditableIface * iface)
+glade_notebook_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-recent-chooser-editor.c b/plugins/gtk+/glade-recent-chooser-editor.c
index 227bed68..92043fdd 100644
--- a/plugins/gtk+/glade-recent-chooser-editor.c
+++ b/plugins/gtk+/glade-recent-chooser-editor.c
@@ -25,14 +25,14 @@
 
 #include "glade-recent-chooser-editor.h"
 
-static void glade_recent_chooser_editor_editable_init (GladeEditableIface *iface);
+static void glade_recent_chooser_editor_editable_init (GladeEditableInterface *iface);
 
 struct _GladeRecentChooserEditorPrivate {
   GtkWidget *select_multiple_editor;
   GtkWidget *show_numbers_editor;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeRecentChooserEditor, glade_recent_chooser_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeRecentChooserEditor)
@@ -82,7 +82,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
-glade_recent_chooser_editor_editable_init (GladeEditableIface *iface)
+glade_recent_chooser_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-scale-button-editor.c b/plugins/gtk+/glade-scale-button-editor.c
index 62b54ebe..59a561c5 100644
--- a/plugins/gtk+/glade-scale-button-editor.c
+++ b/plugins/gtk+/glade-scale-button-editor.c
@@ -25,14 +25,14 @@
 
 #include "glade-scale-button-editor.h"
 
-static void glade_scale_button_editor_editable_init (GladeEditableIface * iface);
+static void glade_scale_button_editor_editable_init (GladeEditableInterface * iface);
 
 struct _GladeScaleButtonEditorPrivate
 {
   GtkWidget *dummy;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeScaleButtonEditor, glade_scale_button_editor, GLADE_TYPE_BUTTON_EDITOR,
                          G_ADD_PRIVATE (GladeScaleButtonEditor)
@@ -66,7 +66,7 @@ glade_scale_button_editor_load (GladeEditable * editable, GladeWidget * widget)
 }
 
 static void
-glade_scale_button_editor_editable_init (GladeEditableIface * iface)
+glade_scale_button_editor_editable_init (GladeEditableInterface * iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-store-editor.c b/plugins/gtk+/glade-store-editor.c
index 802cf61b..207ba8c9 100644
--- a/plugins/gtk+/glade-store-editor.c
+++ b/plugins/gtk+/glade-store-editor.c
@@ -29,12 +29,12 @@
 
 static void glade_store_editor_finalize (GObject *object);
 
-static void glade_store_editor_editable_init (GladeEditableIface *iface);
+static void glade_store_editor_editable_init (GladeEditableInterface *iface);
 
 static void glade_store_editor_grab_focus (GtkWidget *widget);
 
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeStoreEditor, glade_store_editor, GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE,
@@ -86,7 +86,7 @@ glade_store_editor_set_show_name (GladeEditable *editable, gboolean show_name)
 }
 
 static void
-glade_store_editor_editable_init (GladeEditableIface *iface)
+glade_store_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/plugins/gtk+/glade-tool-button-editor.c b/plugins/gtk+/glade-tool-button-editor.c
index 70bdf652..93175a49 100644
--- a/plugins/gtk+/glade-tool-button-editor.c
+++ b/plugins/gtk+/glade-tool-button-editor.c
@@ -27,7 +27,7 @@
 #include "glade-tool-button-editor.h"
 
 
-static void glade_tool_button_editor_editable_init (GladeEditableIface * iface);
+static void glade_tool_button_editor_editable_init (GladeEditableInterface * iface);
 static void glade_tool_button_editor_grab_focus    (GtkWidget * widget);
 
 /* Callbacks */
@@ -59,7 +59,7 @@ struct _GladeToolButtonEditorPrivate
   GtkWidget *radio_group_editor;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeToolButtonEditor, glade_tool_button_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeToolButtonEditor)
@@ -319,7 +319,7 @@ custom_toggled (GtkWidget *widget, GladeToolButtonEditor *button_editor)
 }
 
 static void
-glade_tool_button_editor_editable_init (GladeEditableIface *iface)
+glade_tool_button_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-tool-item-group-editor.c b/plugins/gtk+/glade-tool-item-group-editor.c
index 47d98673..20a7645e 100644
--- a/plugins/gtk+/glade-tool-item-group-editor.c
+++ b/plugins/gtk+/glade-tool-item-group-editor.c
@@ -29,12 +29,12 @@
 
 static void glade_tool_item_group_editor_finalize (GObject *object);
 
-static void glade_tool_item_group_editor_editable_init (GladeEditableIface *iface);
+static void glade_tool_item_group_editor_editable_init (GladeEditableInterface *iface);
 
 static void glade_tool_item_group_editor_grab_focus (GtkWidget *widget);
 
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeToolItemGroupEditor, glade_tool_item_group_editor, GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE,
@@ -100,7 +100,7 @@ glade_tool_item_group_editor_set_show_name (GladeEditable *editable, gboolean sh
 }
 
 static void
-glade_tool_item_group_editor_editable_init (GladeEditableIface *iface)
+glade_tool_item_group_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/plugins/gtk+/glade-treeview-editor.c b/plugins/gtk+/glade-treeview-editor.c
index d70a06d6..5e198065 100644
--- a/plugins/gtk+/glade-treeview-editor.c
+++ b/plugins/gtk+/glade-treeview-editor.c
@@ -28,14 +28,14 @@
 
 static void glade_tree_view_editor_finalize (GObject *object);
 
-static void glade_tree_view_editor_editable_init (GladeEditableIface *iface);
+static void glade_tree_view_editor_editable_init (GladeEditableInterface *iface);
 
 static void glade_tree_view_editor_realize (GtkWidget *widget);
 static void glade_tree_view_editor_grab_focus (GtkWidget *widget);
 
 
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeTreeViewEditor, glade_tree_view_editor, GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE,
@@ -139,7 +139,7 @@ glade_tree_view_editor_set_show_name (GladeEditable *editable,
 }
 
 static void
-glade_tree_view_editor_editable_init (GladeEditableIface *iface)
+glade_tree_view_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE);
 
diff --git a/plugins/gtk+/glade-widget-editor.c b/plugins/gtk+/glade-widget-editor.c
index ddf3367c..99dae4f7 100644
--- a/plugins/gtk+/glade-widget-editor.c
+++ b/plugins/gtk+/glade-widget-editor.c
@@ -29,7 +29,7 @@
 
 static void glade_widget_editor_finalize (GObject *object);
 
-static void glade_widget_editor_editable_init (GladeEditableIface *iface);
+static void glade_widget_editor_editable_init (GladeEditableInterface *iface);
 
 static void markup_toggled (GtkWidget * widget, GladeWidgetEditor *widget_editor);
 static void custom_tooltip_toggled (GtkWidget *widget, GladeWidgetEditor *widget_editor);
@@ -48,7 +48,7 @@ struct _GladeWidgetEditorPrivate
   GtkWidget *border_width_editor;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 #define TOOLTIP_TEXT_PAGE   0
 #define TOOLTIP_MARKUP_PAGE 1
@@ -128,7 +128,7 @@ glade_widget_editor_load (GladeEditable *editable, GladeWidget *gwidget)
 }
 
 static void
-glade_widget_editor_editable_init (GladeEditableIface *iface)
+glade_widget_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
diff --git a/plugins/gtk+/glade-window-editor.c b/plugins/gtk+/glade-window-editor.c
index fbf73a95..661c80ce 100644
--- a/plugins/gtk+/glade-window-editor.c
+++ b/plugins/gtk+/glade-window-editor.c
@@ -25,7 +25,7 @@
 
 #include "glade-window-editor.h"
 
-static void glade_window_editor_editable_init (GladeEditableIface *iface);
+static void glade_window_editor_editable_init (GladeEditableInterface *iface);
 static void glade_window_editor_grab_focus (GtkWidget *widget);
 
 /* Callbacks */
@@ -45,7 +45,7 @@ struct _GladeWindowEditorPrivate {
   GtkWidget *hide_titlebar_editor;
 };
 
-static GladeEditableIface *parent_editable_iface;
+static GladeEditableInterface *parent_editable_iface;
 
 G_DEFINE_TYPE_WITH_CODE (GladeWindowEditor, glade_window_editor, GLADE_TYPE_EDITOR_SKELETON,
                          G_ADD_PRIVATE (GladeWindowEditor)
@@ -119,7 +119,7 @@ glade_window_editor_load (GladeEditable *editable,
 }
 
 static void
-glade_window_editor_editable_init (GladeEditableIface *iface)
+glade_window_editor_editable_init (GladeEditableInterface *iface)
 {
   parent_editable_iface = g_type_interface_peek_parent (iface);