[gnome-photos/gnome-3-12] base-item: Clean up the pixbuf loading code

[Debarshi Ray <debarshir src gnome org>]

commit d0f9d7878319a5d7a7d872e4e690ca9c0baeb19e
Author: Debarshi Ray <debarshir gnome org>
Date:   Sat Mar 22 20:54:15 2014 +0100

    base-item: Clean up the pixbuf loading code
    
    Rename pristine_icon as original_icon and use a single function for
    setting and updating the effects. Be careful not to change the state
    of the item if we failed to generate original_icon.
    
    Streamline the way original_icon (formerly pristine_icon) is set. Set
    it directly, instead of passing it via icon. Use icon only to
    represent the final thumbnail with the rendered emblems and a frame.
    
    Original patch from Cosimo Cecchi for gnome-documents.
    
    Fixes: https://bugzilla.gnome.org/726903

 src/photos-base-item.c               |   64 ++++++++++++++++++++-------------
 src/photos-base-item.h               |    4 +-
 src/photos-collection-icon-watcher.c |    6 ++--
 3 files changed, 44 insertions(+), 30 deletions(-)
---
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index 9005756..1080417 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -49,7 +49,7 @@
 struct _PhotosBaseItemPrivate
 {
   GdkPixbuf *icon;
-  GdkPixbuf *pristine_icon;
+  GdkPixbuf *original_icon;
   GeglNode *graph;
   GeglNode *node;
   GeglRectangle bbox;
@@ -135,10 +135,9 @@ photos_base_item_check_effects_and_update_info (PhotosBaseItem *self)
   PhotosBaseItemPrivate *priv = self->priv;
   GIcon *pix;
   GList *emblem_icons = NULL;
-  GdkPixbuf *icon;
+  GdkPixbuf *emblemed_pixbuf;
 
-  icon = g_object_ref (priv->icon);
-  priv->pristine_icon = g_object_ref (icon);
+  emblemed_pixbuf = g_object_ref (priv->original_icon);
 
   if (priv->favorite)
     {
@@ -157,7 +156,7 @@ photos_base_item_check_effects_and_update_info (PhotosBaseItem *self)
       gint width;
 
       emblem_icons = g_list_reverse (emblem_icons);
-      emblemed_icon = g_emblemed_icon_new (G_ICON (priv->icon), NULL);
+      emblemed_icon = g_emblemed_icon_new (G_ICON (priv->original_icon), NULL);
       for (l = emblem_icons; l != NULL; l = g_list_next (l))
         {
           GEmblem *emblem;
@@ -170,8 +169,8 @@ photos_base_item_check_effects_and_update_info (PhotosBaseItem *self)
 
       theme = gtk_icon_theme_get_default ();
 
-      width = gdk_pixbuf_get_width (priv->icon);
-      height = gdk_pixbuf_get_height (priv->icon);
+      width = gdk_pixbuf_get_width (priv->original_icon);
+      height = gdk_pixbuf_get_height (priv->original_icon);
       size = (width > height) ? width : height;
 
       icon_info = gtk_icon_theme_lookup_by_gicon (theme, emblemed_icon, size, GTK_ICON_LOOKUP_FORCE_SIZE);
@@ -189,8 +188,8 @@ photos_base_item_check_effects_and_update_info (PhotosBaseItem *self)
             }
           else
             {
-              g_object_unref (icon);
-              icon = tmp;
+              g_object_unref (emblemed_pixbuf);
+              emblemed_pixbuf = tmp;
             }
 
           g_object_unref (icon_info);
@@ -199,30 +198,45 @@ photos_base_item_check_effects_and_update_info (PhotosBaseItem *self)
       g_object_unref (emblemed_icon);
     }
 
-  g_object_unref (priv->icon);
+  g_clear_object (&priv->icon);
 
   if (priv->thumb_path != NULL)
     {
       GtkBorder *slice;
 
       slice = photos_utils_get_thumbnail_frame_border ();
-      priv->icon = gd_embed_image_in_frame (icon,
+      priv->icon = gd_embed_image_in_frame (emblemed_pixbuf,
                                             "resource:///org/gnome/photos/thumbnail-frame.png",
                                             slice,
                                             slice);
       gtk_border_free (slice);
     }
   else
-    priv->icon = g_object_ref (icon);
+    priv->icon = g_object_ref (emblemed_pixbuf);
 
   g_signal_emit (self, signals[INFO_UPDATED], 0);
 
-  g_object_unref (icon);
+  g_object_unref (emblemed_pixbuf);
   g_list_free_full (emblem_icons, g_object_unref);
 }
 
 
 static void
+photos_base_item_set_original_icon (PhotosBaseItem *self, GdkPixbuf *icon)
+{
+  PhotosBaseItemPrivate *priv = self->priv;
+
+  if (icon != NULL)
+    {
+      g_clear_object (&priv->original_icon);
+      priv->original_icon = g_object_ref (icon);
+    }
+
+  photos_base_item_check_effects_and_update_info (self);
+}
+
+
+static void
 photos_base_item_create_thumbnail_in_thread_func (gpointer data, gpointer user_data)
 {
   GTask *task = G_TASK (data);
@@ -356,14 +370,10 @@ photos_base_item_get_id (PhotosFilterable *filterable)
 static void
 photos_base_item_icon_updated (PhotosBaseItem *self, GIcon *icon)
 {
-  PhotosBaseItemPrivate *priv = self->priv;
-
   if (icon == NULL)
     return;
 
-  g_clear_object (&priv->icon);
-  priv->icon = g_object_ref (icon);
-  photos_base_item_check_effects_and_update_info (self);
+  photos_base_item_set_original_icon (self, GDK_PIXBUF (icon));
 }
 
 
@@ -402,10 +412,11 @@ photos_base_item_refresh_thumb_path_pixbuf (GObject *source_object, GAsyncResult
 {
   PhotosBaseItem *self = PHOTOS_BASE_ITEM (user_data);
   PhotosBaseItemPrivate *priv = self->priv;
+  GdkPixbuf *pixbuf = NULL;
   GError *error = NULL;
   GInputStream *stream = G_INPUT_STREAM (source_object);
 
-  priv->icon = gdk_pixbuf_new_from_stream_finish (res, &error);
+  pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
   if (error != NULL)
     {
       GFile *file;
@@ -422,10 +433,11 @@ photos_base_item_refresh_thumb_path_pixbuf (GObject *source_object, GAsyncResult
       goto out;
     }
 
-  photos_base_item_check_effects_and_update_info (self);
+  photos_base_item_set_original_icon (self, pixbuf);
 
  out:
   g_input_stream_close_async (stream, G_PRIORITY_DEFAULT, NULL, NULL, NULL);
+  g_clear_object (&pixbuf);
   g_object_unref (self);
 }
 
@@ -638,6 +650,7 @@ static void
 photos_base_item_update_icon_from_type (PhotosBaseItem *self)
 {
   PhotosBaseItemPrivate *priv = self->priv;
+  GdkPixbuf *pixbuf = NULL;
   GIcon *icon = NULL;
   GtkIconInfo *info = NULL;
   GtkIconTheme *theme;
@@ -657,12 +670,13 @@ photos_base_item_update_icon_from_type (PhotosBaseItem *self)
                                          GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
   if (info != NULL)
     {
-      priv->icon = gtk_icon_info_load_icon (info, NULL);
+      pixbuf = gtk_icon_info_load_icon (info, NULL);
       /* TODO: use a GError */
     }
 
-  photos_base_item_check_effects_and_update_info (self);
+  photos_base_item_set_original_icon (self, pixbuf);
 
+  g_clear_object (&pixbuf);
   g_clear_object (&info);
   g_clear_object (&icon);
 }
@@ -841,7 +855,7 @@ photos_base_item_dispose (GObject *object)
 
   g_clear_object (&priv->graph);
   g_clear_object (&priv->icon);
-  g_clear_object (&priv->pristine_icon);
+  g_clear_object (&priv->original_icon);
   g_clear_object (&priv->watcher);
   g_clear_object (&priv->sel_cntrlr);
   g_clear_object (&priv->cursor);
@@ -1160,9 +1174,9 @@ photos_base_item_get_name (PhotosBaseItem *self)
 
 
 GdkPixbuf *
-photos_base_item_get_pristine_icon (PhotosBaseItem *self)
+photos_base_item_get_original_icon (PhotosBaseItem *self)
 {
-  return self->priv->pristine_icon;
+  return self->priv->original_icon;
 }
 
 
diff --git a/src/photos-base-item.h b/src/photos-base-item.h
index 9e799c4..4c1c731 100644
--- a/src/photos-base-item.h
+++ b/src/photos-base-item.h
@@ -1,6 +1,6 @@
 /*
  * Photos - access, organize and share your photos on GNOME
- * Copyright © 2012, 2013 Red Hat, Inc.
+ * Copyright © 2012, 2013, 2014 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
@@ -129,7 +129,7 @@ gint64              photos_base_item_get_mtime          (PhotosBaseItem *self);
 
 const gchar        *photos_base_item_get_name           (PhotosBaseItem *self);
 
-GdkPixbuf          *photos_base_item_get_pristine_icon  (PhotosBaseItem *self);
+GdkPixbuf          *photos_base_item_get_original_icon  (PhotosBaseItem *self);
 
 const gchar        *photos_base_item_get_resource_urn   (PhotosBaseItem *self);
 
diff --git a/src/photos-collection-icon-watcher.c b/src/photos-collection-icon-watcher.c
index 334c5b6..f3344c3 100644
--- a/src/photos-collection-icon-watcher.c
+++ b/src/photos-collection-icon-watcher.c
@@ -80,11 +80,11 @@ photos_collection_icon_watcher_create_collection_icon (PhotosCollectionIconWatch
 
   for (l = priv->items; l != NULL; l = l->next)
     {
-      GdkPixbuf *pristine_icon;
+      GdkPixbuf *original_icon;
       PhotosBaseItem *item = PHOTOS_BASE_ITEM (l->data);
 
-      pristine_icon = photos_base_item_get_pristine_icon (item);
-      icons = g_list_prepend (icons, g_object_ref (pristine_icon));
+      original_icon = photos_base_item_get_original_icon (item);
+      icons = g_list_prepend (icons, g_object_ref (original_icon));
     }
   icons = g_list_reverse (icons);