[gnome-photos] flickr-item: Make it a final class

[Debarshi Ray <debarshir src gnome org>]

commit 696ca6abd74eb79571fce8d388168226f8b21a7c
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Nov 25 10:54:02 2015 +0100

    flickr-item: Make it a final class

 src/photos-flickr-item.c |   28 ++++++++++++++--------------
 src/photos-flickr-item.h |   28 ++--------------------------
 2 files changed, 16 insertions(+), 40 deletions(-)
---
diff --git a/src/photos-flickr-item.c b/src/photos-flickr-item.c
index e4b6a2f..6c50b5c 100644
--- a/src/photos-flickr-item.c
+++ b/src/photos-flickr-item.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
@@ -42,14 +42,19 @@
 #include "photos-utils.h"
 
 
-struct _PhotosFlickrItemPrivate
+struct _PhotosFlickrItem
 {
+  PhotosBaseItem parent_instance;
   PhotosBaseManager *src_mngr;
 };
 
+struct _PhotosFlickrItemClass
+{
+  PhotosBaseItemClass parent_class;
+};
+
 
 G_DEFINE_TYPE_WITH_CODE (PhotosFlickrItem, photos_flickr_item, PHOTOS_TYPE_BASE_ITEM,
-                         G_ADD_PRIVATE (PhotosFlickrItem)
                          photos_utils_ensure_extension_points ();
                          g_io_extension_point_implement (PHOTOS_BASE_ITEM_EXTENSION_POINT_NAME,
                                                          g_define_type_id,
@@ -77,7 +82,7 @@ photos_flickr_item_create_name_fallback (PhotosBaseItem *item)
   gchar *date_modified_str;
   gint64 mtime;
 
-  provider_name = photos_utils_get_provider_name (self->priv->src_mngr, item);
+  provider_name = photos_utils_get_provider_name (self->src_mngr, item);
 
   mtime = photos_base_item_get_mtime (item);
   date_modified = g_date_time_new_from_unix_local (mtime);
@@ -311,7 +316,7 @@ photos_flickr_item_get_source_widget (PhotosBaseItem *item)
   GtkWidget *source_widget;
   const gchar *name;
 
-  name = photos_utils_get_provider_name (self->priv->src_mngr, item);
+  name = photos_utils_get_provider_name (self->src_mngr, item);
   source_widget = gtk_link_button_new_with_label ("https://www.flickr.com/";, name);
   gtk_widget_set_halign (source_widget, GTK_ALIGN_START);
 
@@ -323,7 +328,6 @@ static void
 photos_flickr_item_open (PhotosBaseItem *item, GdkScreen *screen, guint32 timestamp)
 {
   PhotosFlickrItem *self = PHOTOS_FLICKR_ITEM (item);
-  PhotosFlickrItemPrivate *priv = self->priv;
   GError *error;
   GoaAccount *account;
   GoaObject *object;
@@ -336,7 +340,7 @@ photos_flickr_item_open (PhotosBaseItem *item, GdkScreen *screen, guint32 timest
   identifier = photos_base_item_get_identifier (item) + strlen ("flickr:");
 
   resource_urn = photos_base_item_get_resource_urn (item);
-  source = PHOTOS_SOURCE (photos_base_manager_get_object_by_id (priv->src_mngr, resource_urn));
+  source = PHOTOS_SOURCE (photos_base_manager_get_object_by_id (self->src_mngr, resource_urn));
   object = photos_source_get_goa_object (source);
   account = goa_object_peek_account (object);
   identity = goa_account_get_identity (account);
@@ -363,7 +367,7 @@ photos_flickr_item_constructed (GObject *object)
 
   G_OBJECT_CLASS (photos_flickr_item_parent_class)->constructed (object);
 
-  name = photos_utils_get_provider_name (self->priv->src_mngr, PHOTOS_BASE_ITEM (self));
+  name = photos_utils_get_provider_name (self->src_mngr, PHOTOS_BASE_ITEM (self));
   photos_base_item_set_default_app_name (PHOTOS_BASE_ITEM (self), name);
 }
 
@@ -373,7 +377,7 @@ photos_flickr_item_dispose (GObject *object)
 {
   PhotosFlickrItem *self = PHOTOS_FLICKR_ITEM (object);
 
-  g_clear_object (&self->priv->src_mngr);
+  g_clear_object (&self->src_mngr);
 
   G_OBJECT_CLASS (photos_flickr_item_parent_class)->dispose (object);
 }
@@ -382,17 +386,13 @@ photos_flickr_item_dispose (GObject *object)
 static void
 photos_flickr_item_init (PhotosFlickrItem *self)
 {
-  PhotosFlickrItemPrivate *priv;
   GApplication *app;
   PhotosSearchContextState *state;
 
-  self->priv = photos_flickr_item_get_instance_private (self);
-  priv = self->priv;
-
   app = g_application_get_default ();
   state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
 
-  priv->src_mngr = g_object_ref (state->src_mngr);
+  self->src_mngr = g_object_ref (state->src_mngr);
 }
 
 
diff --git a/src/photos-flickr-item.h b/src/photos-flickr-item.h
index bf31efd..ed62301 100644
--- a/src/photos-flickr-item.h
+++ b/src/photos-flickr-item.h
@@ -35,36 +35,12 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
    PHOTOS_TYPE_FLICKR_ITEM, PhotosFlickrItem))
 
-#define PHOTOS_FLICKR_ITEM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-   PHOTOS_TYPE_FLICKR_ITEM, PhotosFlickrItemClass))
-
 #define PHOTOS_IS_FLICKR_ITEM(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
    PHOTOS_TYPE_FLICKR_ITEM))
 
-#define PHOTOS_IS_FLICKR_ITEM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-   PHOTOS_TYPE_FLICKR_ITEM))
-
-#define PHOTOS_FLICKR_ITEM_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-   PHOTOS_TYPE_FLICKR_ITEM, PhotosFlickrItemClass))
-
-typedef struct _PhotosFlickrItem        PhotosFlickrItem;
-typedef struct _PhotosFlickrItemClass   PhotosFlickrItemClass;
-typedef struct _PhotosFlickrItemPrivate PhotosFlickrItemPrivate;
-
-struct _PhotosFlickrItem
-{
-  PhotosBaseItem parent_instance;
-  PhotosFlickrItemPrivate *priv;
-};
-
-struct _PhotosFlickrItemClass
-{
-  PhotosBaseItemClass parent_class;
-};
+typedef struct _PhotosFlickrItem      PhotosFlickrItem;
+typedef struct _PhotosFlickrItemClass PhotosFlickrItemClass;
 
 GType               photos_flickr_item_get_type           (void) G_GNUC_CONST;