[gnome-photos] tracker-overview-controller: Make it a final class

[Debarshi Ray <debarshir src gnome org>]

commit 1b27b87b9aae65f4c99d4dda9a467bc77a987bd2
Author: Debarshi Ray <debarshir gnome org>
Date:   Sun Jan 24 17:09:26 2016 +0100

    tracker-overview-controller: Make it a final class

 src/photos-tracker-overview-controller.c |   24 ++++++++++++------------
 src/photos-tracker-overview-controller.h |   28 ++--------------------------
 2 files changed, 14 insertions(+), 38 deletions(-)
---
diff --git a/src/photos-tracker-overview-controller.c b/src/photos-tracker-overview-controller.c
index 6cca009..1a09354 100644
--- a/src/photos-tracker-overview-controller.c
+++ b/src/photos-tracker-overview-controller.c
@@ -1,6 +1,6 @@
 /*
  * Photos - access, organize and share your photos on GNOME
- * Copyright © 2012, 2013, 2014, 2015 Red Hat, Inc.
+ * Copyright © 2012, 2013, 2014, 2015, 2016 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
@@ -35,16 +35,21 @@
 #include "photos-utils.h"
 
 
-struct _PhotosTrackerOverviewControllerPrivate
+struct _PhotosTrackerOverviewController
 {
+  PhotosTrackerController parent_instance;
   PhotosOffsetController *offset_cntrlr;
 };
 
+struct _PhotosTrackerOverviewControllerClass
+{
+  PhotosTrackerControllerClass parent_class;
+};
+
 
 G_DEFINE_TYPE_WITH_CODE (PhotosTrackerOverviewController,
                          photos_tracker_overview_controller,
                          PHOTOS_TYPE_TRACKER_CONTROLLER,
-                         G_ADD_PRIVATE (PhotosTrackerOverviewController)
                          photos_utils_ensure_extension_points ();
                          g_io_extension_point_implement (PHOTOS_TRACKER_CONTROLLER_EXTENSION_POINT_NAME,
                                                          g_define_type_id,
@@ -56,7 +61,7 @@ static PhotosOffsetController *
 photos_tracker_overview_controller_get_offset_controller (PhotosTrackerController *trk_cntrlr)
 {
   PhotosTrackerOverviewController *self = PHOTOS_TRACKER_OVERVIEW_CONTROLLER (trk_cntrlr);
-  return g_object_ref (self->priv->offset_cntrlr);
+  return g_object_ref (self->offset_cntrlr);
 }
 
 
@@ -70,7 +75,7 @@ photos_tracker_overview_controller_get_query (PhotosTrackerController *trk_cntrl
   app = g_application_get_default ();
   state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
 
-  return photos_query_builder_global_query (state, PHOTOS_QUERY_FLAGS_OVERVIEW, self->priv->offset_cntrlr);
+  return photos_query_builder_global_query (state, PHOTOS_QUERY_FLAGS_OVERVIEW, self->offset_cntrlr);
 }
 
 
@@ -99,7 +104,7 @@ photos_tracker_overview_controller_dispose (GObject *object)
 {
   PhotosTrackerOverviewController *self = PHOTOS_TRACKER_OVERVIEW_CONTROLLER (object);
 
-  g_clear_object (&self->priv->offset_cntrlr);
+  g_clear_object (&self->offset_cntrlr);
 
   G_OBJECT_CLASS (photos_tracker_overview_controller_parent_class)->dispose (object);
 }
@@ -108,12 +113,7 @@ photos_tracker_overview_controller_dispose (GObject *object)
 static void
 photos_tracker_overview_controller_init (PhotosTrackerOverviewController *self)
 {
-  PhotosTrackerOverviewControllerPrivate *priv;
-
-  self->priv = photos_tracker_overview_controller_get_instance_private (self);
-  priv = self->priv;
-
-  priv->offset_cntrlr = photos_offset_overview_controller_dup_singleton ();
+  self->offset_cntrlr = photos_offset_overview_controller_dup_singleton ();
 }
 
 
diff --git a/src/photos-tracker-overview-controller.h b/src/photos-tracker-overview-controller.h
index f37f9d6..79eb687 100644
--- a/src/photos-tracker-overview-controller.h
+++ b/src/photos-tracker-overview-controller.h
@@ -35,36 +35,12 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
    PHOTOS_TYPE_TRACKER_OVERVIEW_CONTROLLER, PhotosTrackerOverviewController))
 
-#define PHOTOS_TRACKER_OVERVIEW_CONTROLLER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-   PHOTOS_TYPE_TRACKER_OVERVIEW_CONTROLLER, PhotosTrackerOverviewControllerClass))
-
 #define PHOTOS_IS_TRACKER_OVERVIEW_CONTROLLER(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
    PHOTOS_TYPE_TRACKER_OVERVIEW_CONTROLLER))
 
-#define PHOTOS_IS_TRACKER_OVERVIEW_CONTROLLER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-   PHOTOS_TYPE_TRACKER_OVERVIEW_CONTROLLER))
-
-#define PHOTOS_TRACKER_OVERVIEW_CONTROLLER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-   PHOTOS_TYPE_TRACKER_OVERVIEW_CONTROLLER, PhotosTrackerOverviewControllerClass))
-
-typedef struct _PhotosTrackerOverviewController        PhotosTrackerOverviewController;
-typedef struct _PhotosTrackerOverviewControllerClass   PhotosTrackerOverviewControllerClass;
-typedef struct _PhotosTrackerOverviewControllerPrivate PhotosTrackerOverviewControllerPrivate;
-
-struct _PhotosTrackerOverviewController
-{
-  PhotosTrackerController parent_instance;
-  PhotosTrackerOverviewControllerPrivate *priv;
-};
-
-struct _PhotosTrackerOverviewControllerClass
-{
-  PhotosTrackerControllerClass parent_class;
-};
+typedef struct _PhotosTrackerOverviewController      PhotosTrackerOverviewController;
+typedef struct _PhotosTrackerOverviewControllerClass PhotosTrackerOverviewControllerClass;
 
 GType                     photos_tracker_overview_controller_get_type          (void) G_GNUC_CONST;