[gnome-color-manager] Use G_DECLARE_DERIVABLE_TYPE

[Richard Hughes <rhughes src gnome org>]

commit cfd551b51d85e75946b3656b2a2b72ebed319283
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jul 19 09:16:29 2016 +0100

    Use G_DECLARE_DERIVABLE_TYPE

 src/gcm-brightness.h |    6 ------
 src/gcm-print.c      |   17 ++++++++---------
 src/gcm-print.h      |   18 ++----------------
 3 files changed, 10 insertions(+), 31 deletions(-)
---
diff --git a/src/gcm-brightness.h b/src/gcm-brightness.h
index ef0d50c..b1e31eb 100644
--- a/src/gcm-brightness.h
+++ b/src/gcm-brightness.h
@@ -32,12 +32,6 @@ G_DECLARE_DERIVABLE_TYPE (GcmBrightness, gcm_brightness, GCM, BRIGHTNESS, GObjec
 struct _GcmBrightnessClass
 {
        GObjectClass    parent_class;
-       /* padding for future expansion */
-       void (*_gcm_reserved1) (void);
-       void (*_gcm_reserved2) (void);
-       void (*_gcm_reserved3) (void);
-       void (*_gcm_reserved4) (void);
-       void (*_gcm_reserved5) (void);
 };
 
 GType           gcm_brightness_get_type                (void);
diff --git a/src/gcm-print.c b/src/gcm-print.c
index 934bc2d..3208a1d 100644
--- a/src/gcm-print.c
+++ b/src/gcm-print.c
@@ -28,12 +28,10 @@
 
 static void     gcm_print_finalize     (GObject     *object);
 
-#define GCM_PRINT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GCM_TYPE_PRINT, GcmPrintPrivate))
-
-struct _GcmPrintPrivate
+typedef struct
 {
        GtkPrintSettings                *settings;
-};
+} GcmPrintPrivate;
 
 enum {
        SIGNAL_STATUS_CHANGED,
@@ -42,7 +40,8 @@ enum {
 
 static guint signals[SIGNAL_LAST] = { 0 };
 
-G_DEFINE_TYPE (GcmPrint, gcm_print, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GcmPrint, gcm_print, G_TYPE_OBJECT)
+#define GET_PRIVATE(o) (gcm_print_get_instance_private (o))
 
 /* temporary object so we can pass state */
 typedef struct {
@@ -182,7 +181,7 @@ gcm_print_done_cb (GtkPrintOperation *operation, GtkPrintOperationResult result,
 gboolean
 gcm_print_with_render_callback (GcmPrint *print, GtkWindow *window, GcmPrintRenderCb render_callback, 
gpointer user_data, GError **error)
 {
-       GcmPrintPrivate *priv = print->priv;
+       GcmPrintPrivate *priv = GET_PRIVATE (print);
        gboolean ret = TRUE;
        GcmPrintTask *task;
        GtkPrintOperationResult res;
@@ -259,15 +258,15 @@ out:
 static void
 gcm_print_init (GcmPrint *print)
 {
-       print->priv = GCM_PRINT_GET_PRIVATE (print);
-       print->priv->settings = gtk_print_settings_new ();
+       GcmPrintPrivate *priv = GET_PRIVATE (print);
+       priv->settings = gtk_print_settings_new ();
 }
 
 static void
 gcm_print_finalize (GObject *object)
 {
        GcmPrint *print = GCM_PRINT (object);
-       GcmPrintPrivate *priv = print->priv;
+       GcmPrintPrivate *priv = GET_PRIVATE (print);
 
        g_object_unref (priv->settings);
 
diff --git a/src/gcm-print.h b/src/gcm-print.h
index 73f8d1f..3ab40bf 100644
--- a/src/gcm-print.h
+++ b/src/gcm-print.h
@@ -26,22 +26,8 @@
 
 G_BEGIN_DECLS
 
-#define GCM_TYPE_PRINT         (gcm_print_get_type ())
-#define GCM_PRINT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GCM_TYPE_PRINT, GcmPrint))
-#define GCM_PRINT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GCM_TYPE_PRINT, GcmPrintClass))
-#define GCM_IS_PRINT(o)                (G_TYPE_CHECK_INSTANCE_TYPE ((o), GCM_TYPE_PRINT))
-#define GCM_IS_PRINT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GCM_TYPE_PRINT))
-#define GCM_PRINT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GCM_TYPE_PRINT, GcmPrintClass))
-
-typedef struct _GcmPrintPrivate        GcmPrintPrivate;
-typedef struct _GcmPrint       GcmPrint;
-typedef struct _GcmPrintClass  GcmPrintClass;
-
-struct _GcmPrint
-{
-        GObject                         parent;
-        GcmPrintPrivate                *priv;
-};
+#define GCM_TYPE_PRINT (gcm_print_get_type ())
+G_DECLARE_DERIVABLE_TYPE (GcmPrint, gcm_print, GCM, PRINT, GObject)
 
 struct _GcmPrintClass
 {