[gnome-control-center] background: Load ~/Pictures asynchronously

[Bastien Nocera <hadess src gnome org>]

commit 44fbef70a292b7ae049554ffd6949d53e3b66d64
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Dec 13 16:19:58 2010 +0000

    background: Load ~/Pictures asynchronously
    
    Using the new gdk-pixbuf helper functions in 2.23.0.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=635601

 configure.ac                           |    2 +
 panels/background/bg-pictures-source.c |  103 +++++++++++++++++++++++++-------
 2 files changed, 82 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 63d63a8..74fd22c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,7 @@ GTK_REQUIRED_VERSION=2.91.6
 DESKTOP_SCHEMAS_REQUIRED_VERSION=0.1.3
 PA_REQUIRED_VERSION=0.9.16
 CANBERRA_REQUIRED_VERSION=0.13
+GDKPIXBUF_REQUIRED_VERSION=2.23.0
 
 COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
  glib-2.0 >= $GLIB_REQUIRED_VERSION
@@ -98,6 +99,7 @@ PKG_CHECK_MODULES(GIO, gio-2.0 gio-unix-2.0)
 PKG_CHECK_MODULES(XML, libxml-2.0)
 PKG_CHECK_MODULES(UPOWER, upower-glib >= 0.9.1)
 PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION)
+PKG_CHECK_MODULES(PIXBUF, gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
 AC_SUBST(CANBERRA_CFLAGS)
 AC_SUBST(CANBERRA_LIBS)
 PKG_CHECK_MODULES(PULSEAUDIO,
diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
index 49e2ba5..d44e6be 100644
--- a/panels/background/bg-pictures-source.c
+++ b/panels/background/bg-pictures-source.c
@@ -117,6 +117,80 @@ bg_pictures_source_class_init (BgPicturesSourceClass *klass)
 }
 
 static void
+picture_scaled (GObject *source_object,
+                GAsyncResult *res,
+                gpointer user_data)
+{
+  BgPicturesSource *bg_source = BG_PICTURES_SOURCE (user_data);
+  GnomeWPItem *item;
+  GError *error = NULL;
+  GdkPixbuf *pixbuf;
+
+  GtkTreeIter iter;
+  GtkTreePath *tree_path;
+  GtkListStore *store;
+
+  store = bg_source_get_liststore (BG_SOURCE (bg_source));
+  item = g_object_get_data (source_object, "item");
+
+  pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
+  if (pixbuf == NULL)
+    {
+      g_warning ("Failed to load image: %s", error->message);
+      g_error_free (error);
+      gnome_wp_item_free (item);
+      return;
+    }
+
+  /* insert the item into the liststore */
+  gtk_list_store_insert_with_values (store, &iter, 0,
+                                     0, pixbuf,
+                                     1, item,
+                                     -1);
+  tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store),
+                                       &iter);
+  item->rowref = gtk_tree_row_reference_new (GTK_TREE_MODEL (store),
+                                             tree_path);
+  gtk_tree_path_free (tree_path);
+
+  g_object_unref (pixbuf);
+}
+
+static void
+picture_opened_for_read (GObject *source_object,
+                         GAsyncResult *res,
+                         gpointer user_data)
+{
+  BgPicturesSource *bg_source = BG_PICTURES_SOURCE (user_data);
+  GnomeWPItem *item;
+  GFileInputStream *stream;
+  GError *error = NULL;
+
+  item = g_object_get_data (source_object, "item");
+  stream = g_file_read_finish (G_FILE (source_object), res, &error);
+  if (stream == NULL)
+    {
+      char *filename;
+
+      filename = g_file_get_path (G_FILE (source_object));
+      g_warning ("Failed to load picture '%s': %s", filename, error->message);
+      g_free (filename);
+      g_error_free (error);
+      gnome_wp_item_free (item);
+      return;
+    }
+
+  g_object_set_data (G_OBJECT (stream), "item", item);
+
+  gdk_pixbuf_new_from_stream_at_scale_async (G_INPUT_STREAM (stream),
+                                             THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT,
+                                             TRUE,
+                                             NULL,
+                                             picture_scaled, bg_source);
+  g_object_unref (stream);
+}
+
+static void
 file_info_async_ready (GObject      *source,
                        GAsyncResult *res,
                        gpointer      user_data)
@@ -127,8 +201,6 @@ file_info_async_ready (GObject      *source,
   GError *err = NULL;
   GFile *parent;
   gchar *path;
-  GtkListStore *store = bg_source_get_liststore (BG_SOURCE (bg_source));
-
   files = g_file_enumerator_next_files_finish (G_FILE_ENUMERATOR (source),
                                                res,
                                                &err);
@@ -162,17 +234,15 @@ file_info_async_ready (GObject      *source,
       if (!strcmp ("image/png", content_type)
           || !strcmp ("image/jpeg", content_type))
         {
-          GdkPixbuf *pixbuf;
           GnomeWPItem *item;
           gchar *filename;
-          GtkTreeIter iter;
-          GtkTreePath *tree_path;
+          GFile *file;
 
           filename = g_build_filename (path, g_file_info_get_name (info), NULL);
 
           /* create a new GnomeWpItem */
           item = gnome_wp_item_new (filename, NULL,
-                                      info,
+                                    info,
                                     priv->thumb_factory);
 
           if (!item)
@@ -182,24 +252,11 @@ file_info_async_ready (GObject      *source,
               continue;
             }
 
-          /* insert the item into the liststore */
-          pixbuf = gdk_pixbuf_new_from_file_at_scale (filename,
-                                                      THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT,
-                                                      TRUE,
-                                                      NULL);
-          gtk_list_store_insert_with_values (store, &iter, 0,
-                                             0, pixbuf,
-                                             1, item,
-                                             -1);
-          tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store),
-                                               &iter);
-          item->rowref =
-            gtk_tree_row_reference_new (GTK_TREE_MODEL (store),
-                                        tree_path);
-          gtk_tree_path_free (tree_path);
-
+          file = g_file_new_for_path (filename);
           g_free (filename);
-          g_object_unref (pixbuf);
+          g_object_set_data (G_OBJECT (file), "item", item);
+          g_file_read_async (file, 0, NULL, picture_opened_for_read, bg_source);
+          g_object_unref (file);
         }
     }