[gnome-photos] create-collection-icon-job: Make it a final class

[Debarshi Ray <debarshir src gnome org>]

commit 159b7c9d5c6e744ae7bce3c1bcfce5cd7c222e66
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Mar 20 22:21:36 2015 +0100

    create-collection-icon-job: Make it a final class

 src/photos-create-collection-icon-job.c |   42 ++++++++++++++-----------------
 src/photos-create-collection-icon-job.h |   28 +-------------------
 2 files changed, 21 insertions(+), 49 deletions(-)
---
diff --git a/src/photos-create-collection-icon-job.c b/src/photos-create-collection-icon-job.c
index 1dfe492..75e9c7d 100644
--- a/src/photos-create-collection-icon-job.c
+++ b/src/photos-create-collection-icon-job.c
@@ -1,6 +1,6 @@
 /*
  * Photos - access, organize and share your photos on GNOME
- * Copyright © 2014 Red Hat, Inc.
+ * Copyright © 2014, 2015 Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,8 +31,9 @@
 #include "photos-tracker-queue.h"
 
 
-struct _PhotosCreateCollectionIconJobPrivate
+struct _PhotosCreateCollectionIconJob
 {
+  GObject parent_instance;
   GIcon *icon;
   PhotosCreateCollectionIconJobCallback callback;
   PhotosTrackerQueue *queue;
@@ -40,6 +41,11 @@ struct _PhotosCreateCollectionIconJobPrivate
   gpointer user_data;
 };
 
+struct _PhotosCreateCollectionIconJobClass
+{
+  GObjectClass parent_class;
+};
+
 enum
 {
   PROP_0,
@@ -47,18 +53,16 @@ enum
 };
 
 
-G_DEFINE_TYPE_WITH_PRIVATE (PhotosCreateCollectionIconJob, photos_create_collection_icon_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PhotosCreateCollectionIconJob, photos_create_collection_icon_job, G_TYPE_OBJECT);
 
 
 static void
 photos_create_collection_icon_job_emit_callback (PhotosCreateCollectionIconJob *self)
 {
-  PhotosCreateCollectionIconJobPrivate *priv = self->priv;
-
-  if (priv->callback == NULL)
+  if (self->callback == NULL)
     return;
 
-  (*priv->callback) (priv->icon, priv->user_data);
+  (*self->callback) (self->icon, self->user_data);
 }
 
 
@@ -66,10 +70,9 @@ static void
 photos_create_collection_icon_job_dispose (GObject *object)
 {
   PhotosCreateCollectionIconJob *self = PHOTOS_CREATE_COLLECTION_ICON_JOB (object);
-  PhotosCreateCollectionIconJobPrivate *priv = self->priv;
 
-  g_clear_object (&priv->icon);
-  g_clear_object (&priv->queue);
+  g_clear_object (&self->icon);
+  g_clear_object (&self->queue);
 
   G_OBJECT_CLASS (photos_create_collection_icon_job_parent_class)->dispose (object);
 }
@@ -80,7 +83,7 @@ photos_create_collection_icon_job_finalize (GObject *object)
 {
   PhotosCreateCollectionIconJob *self = PHOTOS_CREATE_COLLECTION_ICON_JOB (object);
 
-  g_free (self->priv->urn);
+  g_free (self->urn);
 
   G_OBJECT_CLASS (photos_create_collection_icon_job_parent_class)->finalize (object);
 }
@@ -97,7 +100,7 @@ photos_create_collection_icon_job_set_property (GObject *object,
   switch (prop_id)
     {
     case PROP_URN:
-      self->priv->urn = g_value_dup_string (value);
+      self->urn = g_value_dup_string (value);
       break;
 
     default:
@@ -110,12 +113,7 @@ photos_create_collection_icon_job_set_property (GObject *object,
 static void
 photos_create_collection_icon_job_init (PhotosCreateCollectionIconJob *self)
 {
-  PhotosCreateCollectionIconJobPrivate *priv = self->priv;
-
-  self->priv = photos_create_collection_icon_job_get_instance_private (self);
-  priv = self->priv;
-
-  priv->queue = photos_tracker_queue_dup_singleton (NULL, NULL);
+  self->queue = photos_tracker_queue_dup_singleton (NULL, NULL);
 }
 
 
@@ -150,16 +148,14 @@ photos_create_collection_icon_job_run (PhotosCreateCollectionIconJob *self,
                                        PhotosCreateCollectionIconJobCallback callback,
                                        gpointer user_data)
 {
-  PhotosCreateCollectionIconJobPrivate *priv = self->priv;
-
-  if (G_UNLIKELY (priv->queue == NULL))
+  if (G_UNLIKELY (self->queue == NULL))
     {
       photos_create_collection_icon_job_emit_callback (self);
       return;
     }
 
-  priv->callback = callback;
-  priv->user_data = user_data;
+  self->callback = callback;
+  self->user_data = user_data;
 
   /* TODO: build collection icon query */
   photos_create_collection_icon_job_emit_callback (self);
diff --git a/src/photos-create-collection-icon-job.h b/src/photos-create-collection-icon-job.h
index ff4495c..5ef3f59 100644
--- a/src/photos-create-collection-icon-job.h
+++ b/src/photos-create-collection-icon-job.h
@@ -35,38 +35,14 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
    PHOTOS_TYPE_CREATE_COLLECTION_ICON_JOB, PhotosCreateCollectionIconJob))
 
-#define PHOTOS_CREATE_COLLECTION_ICON_JOB_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-   PHOTOS_TYPE_CREATE_COLLECTION_ICON_JOB, PhotosCreateCollectionIconJobClass))
-
 #define PHOTOS_IS_CREATE_COLLECTION_ICON_JOB(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
    PHOTOS_TYPE_CREATE_COLLECTION_ICON_JOB))
 
-#define PHOTOS_IS_CREATE_COLLECTION_ICON_JOB_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-   PHOTOS_TYPE_CREATE_COLLECTION_ICON_JOB))
-
-#define PHOTOS_CREATE_COLLECTION_ICON_JOB_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-   PHOTOS_TYPE_CREATE_COLLECTION_ICON_JOB, PhotosCreateCollectionIconJobClass))
-
 typedef void (*PhotosCreateCollectionIconJobCallback) (GIcon *, gpointer);
 
-typedef struct _PhotosCreateCollectionIconJob        PhotosCreateCollectionIconJob;
-typedef struct _PhotosCreateCollectionIconJobClass   PhotosCreateCollectionIconJobClass;
-typedef struct _PhotosCreateCollectionIconJobPrivate PhotosCreateCollectionIconJobPrivate;
-
-struct _PhotosCreateCollectionIconJob
-{
-  GObject parent_instance;
-  PhotosCreateCollectionIconJobPrivate *priv;
-};
-
-struct _PhotosCreateCollectionIconJobClass
-{
-  GObjectClass parent_class;
-};
+typedef struct _PhotosCreateCollectionIconJob      PhotosCreateCollectionIconJob;
+typedef struct _PhotosCreateCollectionIconJobClass PhotosCreateCollectionIconJobClass;
 
 GType                          photos_create_collection_icon_job_get_type  (void) G_GNUC_CONST;