[gnome-photos/gnome-3-16] set-collection-job: Make it a final class

[Debarshi Ray <debarshir src gnome org>]

commit ea33a2df5f6d8b5bc71036b87906229b285f9107
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Mar 12 23:57:18 2015 +0100

    set-collection-job: Make it a final class

 src/photos-set-collection-job.c |   63 ++++++++++++++++++---------------------
 src/photos-set-collection-job.h |   28 +----------------
 2 files changed, 31 insertions(+), 60 deletions(-)
---
diff --git a/src/photos-set-collection-job.c b/src/photos-set-collection-job.c
index ec698d2..e5ae67c 100644
--- a/src/photos-set-collection-job.c
+++ b/src/photos-set-collection-job.c
@@ -1,6 +1,6 @@
 /*
  * Photos - access, organize and share your photos on GNOME
- * Copyright © 2013, 2014 Red Hat, Inc.
+ * Copyright © 2013, 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
@@ -38,8 +38,9 @@
 #include "photos-update-mtime-job.h"
 
 
-struct _PhotosSetCollectionJobPrivate
+struct _PhotosSetCollectionJob
 {
+  GObject parent_instance;
   PhotosSelectionController *sel_cntrlr;
   PhotosSetCollectionJobCallback callback;
   PhotosTrackerQueue *queue;
@@ -49,6 +50,11 @@ struct _PhotosSetCollectionJobPrivate
   gpointer user_data;
 };
 
+struct _PhotosSetCollectionJobClass
+{
+  GObjectClass parent_class;
+};
+
 enum
 {
   PROP_0,
@@ -57,17 +63,16 @@ enum
 };
 
 
-G_DEFINE_TYPE_WITH_PRIVATE (PhotosSetCollectionJob, photos_set_collection_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PhotosSetCollectionJob, photos_set_collection_job, G_TYPE_OBJECT);
 
 
 static void
 photos_set_collection_job_update_mtime (gpointer user_data)
 {
   PhotosSetCollectionJob *self = PHOTOS_SET_COLLECTION_JOB (user_data);
-  PhotosSetCollectionJobPrivate *priv = self->priv;
 
-  if (priv->callback != NULL)
-    (*priv->callback) (priv->user_data);
+  if (self->callback != NULL)
+    (*self->callback) (self->user_data);
 
   g_object_unref (self);
 }
@@ -76,14 +81,12 @@ photos_set_collection_job_update_mtime (gpointer user_data)
 static void
 photos_set_collection_job_job_collector (PhotosSetCollectionJob *self)
 {
-  PhotosSetCollectionJobPrivate *priv = self->priv;
-
-  priv->running_jobs--;
-  if (priv->running_jobs == 0)
+  self->running_jobs--;
+  if (self->running_jobs == 0)
     {
       PhotosUpdateMtimeJob *job;
 
-      job = photos_update_mtime_job_new (priv->collection_urn);
+      job = photos_update_mtime_job_new (self->collection_urn);
       photos_update_mtime_job_run (job, photos_set_collection_job_update_mtime, g_object_ref (self));
       g_object_unref (job);
     }
@@ -114,10 +117,9 @@ static void
 photos_set_collection_job_dispose (GObject *object)
 {
   PhotosSetCollectionJob *self = PHOTOS_SET_COLLECTION_JOB (object);
-  PhotosSetCollectionJobPrivate *priv = self->priv;
 
-  g_clear_object (&priv->sel_cntrlr);
-  g_clear_object (&priv->queue);
+  g_clear_object (&self->sel_cntrlr);
+  g_clear_object (&self->queue);
 
   G_OBJECT_CLASS (photos_set_collection_job_parent_class)->dispose (object);
 }
@@ -128,7 +130,7 @@ photos_set_collection_job_finalize (GObject *object)
 {
   PhotosSetCollectionJob *self = PHOTOS_SET_COLLECTION_JOB (object);
 
-  g_free (self->priv->collection_urn);
+  g_free (self->collection_urn);
 
   G_OBJECT_CLASS (photos_set_collection_job_parent_class)->finalize (object);
 }
@@ -138,16 +140,15 @@ static void
 photos_set_collection_job_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec 
*pspec)
 {
   PhotosSetCollectionJob *self = PHOTOS_SET_COLLECTION_JOB (object);
-  PhotosSetCollectionJobPrivate *priv = self->priv;
 
   switch (prop_id)
     {
     case PROP_COLLECTION_URN:
-      priv->collection_urn = g_value_dup_string (value);
+      self->collection_urn = g_value_dup_string (value);
       break;
 
     case PROP_SETTING:
-      priv->setting = g_value_get_boolean (value);
+      self->setting = g_value_get_boolean (value);
       break;
 
     default:
@@ -160,13 +161,8 @@ photos_set_collection_job_set_property (GObject *object, guint prop_id, const GV
 static void
 photos_set_collection_job_init (PhotosSetCollectionJob *self)
 {
-  PhotosSetCollectionJobPrivate *priv = self->priv;
-
-  self->priv = photos_set_collection_job_get_instance_private (self);
-  priv = self->priv;
-
-  priv->sel_cntrlr = photos_selection_controller_dup_singleton ();
-  priv->queue = photos_tracker_queue_dup_singleton (NULL, NULL);
+  self->sel_cntrlr = photos_selection_controller_dup_singleton ();
+  self->queue = photos_tracker_queue_dup_singleton (NULL, NULL);
 }
 
 
@@ -213,37 +209,36 @@ photos_set_collection_job_run (PhotosSetCollectionJob *self,
                                PhotosSetCollectionJobCallback callback,
                                gpointer user_data)
 {
-  PhotosSetCollectionJobPrivate *priv = self->priv;
   GApplication *app;
   GList *l;
   GList *urns;
   PhotosSearchContextState *state;
 
-  if (G_UNLIKELY (priv->queue == NULL))
+  if (G_UNLIKELY (self->queue == NULL))
     {
       if (callback != NULL)
         (*callback) (user_data);
       return;
     }
 
-  priv->callback = callback;
-  priv->user_data = user_data;
+  self->callback = callback;
+  self->user_data = user_data;
 
   app = g_application_get_default ();
   state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
 
-  urns = photos_selection_controller_get_selection (priv->sel_cntrlr);
+  urns = photos_selection_controller_get_selection (self->sel_cntrlr);
   for (l = urns; l != NULL; l = l->next)
     {
       PhotosQuery *query;
       const gchar *urn = (gchar *) l->data;
 
-      if (g_strcmp0 (priv->collection_urn, urn) == 0)
+      if (g_strcmp0 (self->collection_urn, urn) == 0)
         continue;
 
-      priv->running_jobs++;
-      query = photos_query_builder_set_collection_query (state, urn, priv->collection_urn, priv->setting);
-      photos_tracker_queue_update (priv->queue,
+      self->running_jobs++;
+      query = photos_query_builder_set_collection_query (state, urn, self->collection_urn, self->setting);
+      photos_tracker_queue_update (self->queue,
                                    query->sparql,
                                    NULL,
                                    photos_set_collection_job_query_executed,
diff --git a/src/photos-set-collection-job.h b/src/photos-set-collection-job.h
index b16fec9..a8f0386 100644
--- a/src/photos-set-collection-job.h
+++ b/src/photos-set-collection-job.h
@@ -35,38 +35,14 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
    PHOTOS_TYPE_SET_COLLECTION_JOB, PhotosSetCollectionJob))
 
-#define PHOTOS_SET_COLLECTION_JOB_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-   PHOTOS_TYPE_SET_COLLECTION_JOB, PhotosSetCollectionJobClass))
-
 #define PHOTOS_IS_SET_COLLECTION_JOB(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
    PHOTOS_TYPE_SET_COLLECTION_JOB))
 
-#define PHOTOS_IS_SET_COLLECTION_JOB_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-   PHOTOS_TYPE_SET_COLLECTION_JOB))
-
-#define PHOTOS_SET_COLLECTION_JOB_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-   PHOTOS_TYPE_SET_COLLECTION_JOB, PhotosSetCollectionJobClass))
-
 typedef void (*PhotosSetCollectionJobCallback) (gpointer);
 
-typedef struct _PhotosSetCollectionJob        PhotosSetCollectionJob;
-typedef struct _PhotosSetCollectionJobClass   PhotosSetCollectionJobClass;
-typedef struct _PhotosSetCollectionJobPrivate PhotosSetCollectionJobPrivate;
-
-struct _PhotosSetCollectionJob
-{
-  GObject parent_instance;
-  PhotosSetCollectionJobPrivate *priv;
-};
-
-struct _PhotosSetCollectionJobClass
-{
-  GObjectClass parent_class;
-};
+typedef struct _PhotosSetCollectionJob      PhotosSetCollectionJob;
+typedef struct _PhotosSetCollectionJobClass PhotosSetCollectionJobClass;
 
 GType                     photos_set_collection_job_get_type    (void) G_GNUC_CONST;