[gnome-control-center/wip/rancell/g-define-type] phase 7

[Robert Ancell <rancell src gnome org>]

commit b0713178283c52f555b0cb62f43133617ecc6682
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Sep 5 12:32:04 2017 +1200

    phase 7

 panels/printers/pp-job.c |   42 +++++++++++++++++-------------------------
 panels/printers/pp-job.h |    5 -----
 2 files changed, 17 insertions(+), 30 deletions(-)
---
diff --git a/panels/printers/pp-job.c b/panels/printers/pp-job.c
index 7307760..7623774 100644
--- a/panels/printers/pp-job.c
+++ b/panels/printers/pp-job.c
@@ -43,16 +43,16 @@ ippGetRange (ipp_attribute_t *attr,
 }
 #endif
 
-typedef struct
+struct _PpJob
 {
-  GObject parent;
+  GObject parent_instance;
 
   gint   id;
   gchar *title;
   gint   state;
-} PpJobPrivate;
+};
 
-G_DEFINE_TYPE_WITH_PRIVATE (PpJob, pp_job, G_TYPE_OBJECT)
+G_DEFINE_TYPE (PpJob, pp_job, G_TYPE_OBJECT)
 
 enum
 {
@@ -180,20 +180,18 @@ pp_job_get_property (GObject    *object,
                      GValue     *value,
                      GParamSpec *pspec)
 {
-  PpJobPrivate *priv;
-
-  priv = pp_job_get_instance_private (PP_JOB (object));
+  PpJob *self = PP_JOB (object);
 
   switch (property_id)
     {
       case PROP_ID:
-        g_value_set_int (value, priv->id);
+        g_value_set_int (value, self->id);
         break;
       case PROP_TITLE:
-        g_value_set_string (value, priv->title);
+        g_value_set_string (value, self->title);
         break;
       case PROP_STATE:
-        g_value_set_int (value, priv->state);
+        g_value_set_int (value, self->state);
         break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -207,21 +205,19 @@ pp_job_set_property (GObject      *object,
                      const GValue *value,
                      GParamSpec   *pspec)
 {
-  PpJobPrivate *priv;
-
-  priv = pp_job_get_instance_private (PP_JOB (object));
+  PpJob *self = PP_JOB (object);
 
   switch (property_id)
     {
       case PROP_ID:
-        priv->id = g_value_get_int (value);
+        self->id = g_value_get_int (value);
         break;
       case PROP_TITLE:
-        g_free (priv->title);
-        priv->title = g_value_dup_string (value);
+        g_free (self->title);
+        self->title = g_value_dup_string (value);
         break;
       case PROP_STATE:
-        priv->state = g_value_get_int (value);
+        self->state = g_value_get_int (value);
         break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -232,11 +228,9 @@ pp_job_set_property (GObject      *object,
 static void
 pp_job_finalize (GObject *object)
 {
-  PpJobPrivate *priv;
+  PpJob *self = PP_JOB (object);
 
-  priv = pp_job_get_instance_private (PP_JOB (object));
-
-  g_free (priv->title);
+  g_free (self->title);
 
   G_OBJECT_CLASS (pp_job_parent_class)->finalize (object);
 }
@@ -279,19 +273,17 @@ _pp_job_get_attributes_thread (GTask        *task,
                                gpointer      task_data,
                                GCancellable *cancellable)
 {
+  PpJob *self = PP_JOB (source_object);
   ipp_attribute_t *attr = NULL;
   GVariantBuilder  builder;
   GVariant        *attributes = NULL;
   gchar          **attributes_names = task_data;
-  PpJobPrivate    *priv;
   ipp_t           *request;
   ipp_t           *response = NULL;
   gchar           *job_uri;
   gint             i, j, length = 0, n_attrs = 0;
 
-  priv = pp_job_get_instance_private (source_object);
-
-  job_uri = g_strdup_printf ("ipp://localhost/jobs/%d", priv->id);
+  job_uri = g_strdup_printf ("ipp://localhost/jobs/%d", self->id);
 
   if (attributes_names != NULL)
     {
diff --git a/panels/printers/pp-job.h b/panels/printers/pp-job.h
index ba6f461..529581a 100644
--- a/panels/printers/pp-job.h
+++ b/panels/printers/pp-job.h
@@ -31,11 +31,6 @@ G_BEGIN_DECLS
 #define PP_TYPE_JOB (pp_job_get_type ())
 G_DECLARE_FINAL_TYPE (PpJob, pp_job, PP, JOB, GObject)
 
-struct _PpJob
-{
-  GObject parent_instance;
-};
-
 void           pp_job_set_hold_until_async       (PpJob                *job,
                                                   const gchar          *job_hold_until);