gladeui: Use G_DECLARE_DERIVABLE_TYPE for GladeEditorSkeleton

2 files changed, 9 insertions, 27 deletions

diff --git a/gladeui/glade-editor-skeleton.c b/gladeui/glade-editor-skeleton.c
index 6d4e68de..3dd4c491 100644
--- a/gladeui/glade-editor-skeleton.c
+++ b/gladeui/glade-editor-skeleton.c
@@ -40,6 +40,8 @@ static void      glade_editor_skeleton_editable_init   (GladeEditableIface *ifac
 /* GtkBuildableIface */
 static void      glade_editor_skeleton_buildable_init  (GtkBuildableIface *iface);
 
+typedef struct _GladeEditorSkeletonPrivate GladeEditorSkeletonPrivate;
+
 struct _GladeEditorSkeletonPrivate
 {
   GSList *editors;
@@ -58,7 +60,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeEditorSkeleton, glade_editor_skeleton, GTK_TYPE_BO
 static void
 glade_editor_skeleton_init (GladeEditorSkeleton *skeleton)
 {
-  skeleton->priv = glade_editor_skeleton_get_instance_private (skeleton);
+  
 }
 
 static void
@@ -76,7 +78,7 @@ static void
 glade_editor_skeleton_dispose (GObject *object)
 {
   GladeEditorSkeleton *skeleton = GLADE_EDITOR_SKELETON (object);
-  GladeEditorSkeletonPrivate *priv = skeleton->priv;
+  GladeEditorSkeletonPrivate *priv = glade_editor_skeleton_get_instance_private (skeleton);
 
   if (priv->editors)
     {
@@ -95,7 +97,7 @@ glade_editor_skeleton_load (GladeEditable *editable,
                             GladeWidget   *widget)
 {
   GladeEditorSkeleton *skeleton = GLADE_EDITOR_SKELETON (editable);
-  GladeEditorSkeletonPrivate *priv = skeleton->priv;
+  GladeEditorSkeletonPrivate *priv = glade_editor_skeleton_get_instance_private (skeleton);
   GSList *l;
 
   /* Chain up to default implementation */
@@ -113,7 +115,7 @@ static void
 glade_editor_skeleton_set_show_name (GladeEditable *editable, gboolean show_name)
 {
   GladeEditorSkeleton *skeleton = GLADE_EDITOR_SKELETON (editable);
-  GladeEditorSkeletonPrivate *priv = skeleton->priv;
+  GladeEditorSkeletonPrivate *priv = glade_editor_skeleton_get_instance_private (skeleton);
   GSList *l;
 
   for (l = priv->editors; l; l = l->next)
@@ -254,13 +256,11 @@ void
 glade_editor_skeleton_add_editor (GladeEditorSkeleton *skeleton,
                                   GladeEditable       *editor)
 {
-  GladeEditorSkeletonPrivate *priv;
+  GladeEditorSkeletonPrivate *priv = glade_editor_skeleton_get_instance_private (skeleton);
 
   g_return_if_fail (GLADE_IS_EDITOR_SKELETON (skeleton));
   g_return_if_fail (GLADE_IS_EDITABLE (editor));
 
-  priv = skeleton->priv;
-
   g_object_ref (editor);
   priv->editors = g_slist_prepend (priv->editors, editor);
 }
diff --git a/gladeui/glade-editor-skeleton.h b/gladeui/glade-editor-skeleton.h
index dd4dbc8f..1e6d22be 100644
--- a/gladeui/glade-editor-skeleton.h
+++ b/gladeui/glade-editor-skeleton.h
@@ -27,32 +27,14 @@
 
 G_BEGIN_DECLS
 
-#define GLADE_TYPE_EDITOR_SKELETON            (glade_editor_skeleton_get_type ())
-#define GLADE_EDITOR_SKELETON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_EDITOR_SKELETON, GladeEditorSkeleton))
-#define GLADE_EDITOR_SKELETON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_EDITOR_SKELETON, GladeEditorSkeletonClass))
-#define GLADE_IS_EDITOR_SKELETON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_EDITOR_SKELETON))
-#define GLADE_IS_EDITOR_SKELETON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_EDITOR_SKELETON))
-#define GLADE_EDITOR_SKELETON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_EDITOR_SKELETON, GladeEditorSkeletonClass))
-
-typedef struct _GladeEditorSkeleton             GladeEditorSkeleton;
-typedef struct _GladeEditorSkeletonClass        GladeEditorSkeletonClass;
-typedef struct _GladeEditorSkeletonPrivate      GladeEditorSkeletonPrivate;
-
-struct _GladeEditorSkeleton
-{
-  /*< private >*/
-  GtkBox box;
-
-  GladeEditorSkeletonPrivate *priv;
-};
+#define GLADE_TYPE_EDITOR_SKELETON glade_editor_skeleton_get_type ()
+G_DECLARE_DERIVABLE_TYPE (GladeEditorSkeleton, glade_editor_skeleton, GLADE, EDITOR_SKELETON, GtkBox)
 
 struct _GladeEditorSkeletonClass
 {
   GtkBoxClass parent_class;
 };
 
-GType          glade_editor_skeleton_get_type          (void) G_GNUC_CONST;
-
 GtkWidget     *glade_editor_skeleton_new               (void);
 void           glade_editor_skeleton_add_editor        (GladeEditorSkeleton *skeleton,
                                                         GladeEditable       *editor);