[gnome-photos] offset-controller: Drop the priv pointer

[Debarshi Ray <debarshir src gnome org>]

commit e4175cf95cd8266d5aebbb0f8ba1606f83b01aa3
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Apr 20 00:41:59 2016 +0200

    offset-controller: Drop the priv pointer
    
    The current GObject recommendation is to use the generated
    get_instance_private function instead of a separate priv pointer in the
    instance struct. The saves one pointer per class in the heirarchy
    multiplied by the number of instances of the type, and the function is
    fast enough.

 src/photos-offset-controller.c |   48 ++++++++++++++++++++++++++++-----------
 src/photos-offset-controller.h |    1 -
 2 files changed, 34 insertions(+), 15 deletions(-)
---
diff --git a/src/photos-offset-controller.c b/src/photos-offset-controller.c
index 3a15237..5d29e4e 100644
--- a/src/photos-offset-controller.c
+++ b/src/photos-offset-controller.c
@@ -83,7 +83,7 @@ photos_offset_controller_cursor_next (GObject *source_object, GAsyncResult *res,
     }
 
   self = PHOTOS_OFFSET_CONTROLLER (user_data);
-  priv = self->priv;
+  priv = photos_offset_controller_get_instance_private (self);
 
   if (success)
     {
@@ -100,10 +100,13 @@ static void
 photos_offset_controller_reset_count_query_executed (GObject *source_object, GAsyncResult *res, gpointer 
user_data)
 {
   PhotosOffsetController *self = PHOTOS_OFFSET_CONTROLLER (user_data);
+  PhotosOffsetControllerPrivate *priv;
   TrackerSparqlConnection *connection = TRACKER_SPARQL_CONNECTION (source_object);
   TrackerSparqlCursor *cursor;
   GError *error;
 
+  priv = photos_offset_controller_get_instance_private (self);
+
   error = NULL;
   cursor = tracker_sparql_connection_query_finish (connection, res, &error);
   if (error != NULL)
@@ -113,7 +116,7 @@ photos_offset_controller_reset_count_query_executed (GObject *source_object, GAs
     }
 
   tracker_sparql_cursor_next_async (cursor,
-                                    self->priv->cancellable,
+                                    priv->cancellable,
                                     photos_offset_controller_cursor_next,
                                     self);
   g_object_unref (cursor);
@@ -124,14 +127,17 @@ static void
 photos_offset_controller_dispose (GObject *object)
 {
   PhotosOffsetController *self = PHOTOS_OFFSET_CONTROLLER (object);
+  PhotosOffsetControllerPrivate *priv;
+
+  priv = photos_offset_controller_get_instance_private (self);
 
-  if (self->priv->cancellable != NULL)
+  if (priv->cancellable != NULL)
     {
-      g_cancellable_cancel (self->priv->cancellable);
-      g_clear_object (&self->priv->cancellable);
+      g_cancellable_cancel (priv->cancellable);
+      g_clear_object (&priv->cancellable);
     }
 
-  g_clear_object (&self->priv->queue);
+  g_clear_object (&priv->queue);
 
   G_OBJECT_CLASS (photos_offset_controller_parent_class)->dispose (object);
 }
@@ -142,8 +148,7 @@ photos_offset_controller_init (PhotosOffsetController *self)
 {
   PhotosOffsetControllerPrivate *priv;
 
-  self->priv = photos_offset_controller_get_instance_private (self);
-  priv = self->priv;
+  priv = photos_offset_controller_get_instance_private (self);
 
   priv->cancellable = g_cancellable_new ();
   priv->queue = photos_tracker_queue_dup_singleton (NULL, NULL);
@@ -193,21 +198,29 @@ photos_offset_controller_new (void)
 gint
 photos_offset_controller_get_count (PhotosOffsetController *self)
 {
-  return self->priv->count;
+  PhotosOffsetControllerPrivate *priv;
+
+  priv = photos_offset_controller_get_instance_private (self);
+  return priv->count;
 }
 
 
 gint
 photos_offset_controller_get_offset (PhotosOffsetController *self)
 {
-  return self->priv->offset;
+  PhotosOffsetControllerPrivate *priv;
+
+  priv = photos_offset_controller_get_instance_private (self);
+  return priv->offset;
 }
 
 
 gint
 photos_offset_controller_get_remaining (PhotosOffsetController *self)
 {
-  PhotosOffsetControllerPrivate *priv = self->priv;
+  PhotosOffsetControllerPrivate *priv;
+
+  priv = photos_offset_controller_get_instance_private (self);
   return priv->count - (priv->offset + OFFSET_STEP);
 }
 
@@ -222,9 +235,11 @@ photos_offset_controller_get_step (PhotosOffsetController *self)
 void
 photos_offset_controller_increase_offset (PhotosOffsetController *self)
 {
-  PhotosOffsetControllerPrivate *priv = self->priv;
+  PhotosOffsetControllerPrivate *priv;
   gint remaining;
 
+  priv = photos_offset_controller_get_instance_private (self);
+
   remaining = photos_offset_controller_get_remaining (self);
   if (remaining <= 0)
     return;
@@ -237,9 +252,11 @@ photos_offset_controller_increase_offset (PhotosOffsetController *self)
 void
 photos_offset_controller_reset_count (PhotosOffsetController *self)
 {
-  PhotosOffsetControllerPrivate *priv = self->priv;
+  PhotosOffsetControllerPrivate *priv;
   PhotosQuery *query;
 
+  priv = photos_offset_controller_get_instance_private (self);
+
   if (G_UNLIKELY (priv->queue == NULL))
     return;
 
@@ -259,5 +276,8 @@ photos_offset_controller_reset_count (PhotosOffsetController *self)
 void
 photos_offset_controller_reset_offset (PhotosOffsetController *self)
 {
-  self->priv->offset = 0;
+  PhotosOffsetControllerPrivate *priv;
+
+  priv = photos_offset_controller_get_instance_private (self);
+  priv->offset = 0;
 }
diff --git a/src/photos-offset-controller.h b/src/photos-offset-controller.h
index 015aa6d..9132f43 100644
--- a/src/photos-offset-controller.h
+++ b/src/photos-offset-controller.h
@@ -60,7 +60,6 @@ typedef struct _PhotosOffsetControllerPrivate PhotosOffsetControllerPrivate;
 struct _PhotosOffsetController
 {
   GObject parent_instance;
-  PhotosOffsetControllerPrivate *priv;
 };
 
 struct _PhotosOffsetControllerClass