[Xfce4-commits] <ristretto:master> Improve cancellation of image_load

[Stephan Arts]

Updating branch refs/heads/master
         to 09f2c67e9f24784ba528af9631e60cc38166fba9 (commit)
       from c13156f68cd93ccc2bcbf21af394b65ebf873601 (commit)

commit 09f2c67e9f24784ba528af9631e60cc38166fba9
Author: Stephan Arts <stephan at xfce.org>
Date:   Mon Jun 15 22:07:52 2009 +0200

    Improve cancellation of image_load

 src/image.c |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/image.c b/src/image.c
index 9a8c850..b19cc35 100644
--- a/src/image.c
+++ b/src/image.c
@@ -99,6 +99,7 @@ struct _RsttoImagePriv
     /*************/
     GFile *file;
     GFileMonitor *monitor;
+    GCancellable *cancellable;
 
     /* File I/O data */
     /*****************/
@@ -129,6 +130,7 @@ rstto_image_init (GObject *object)
     image->priv = g_new0 (RsttoImagePriv, 1);
 
     image->priv->buffer = g_new0 (guchar, RSTTO_IMAGE_BUFFER_SIZE);
+    image->priv->cancellable = g_cancellable_new();
 
 }
 
@@ -176,6 +178,13 @@ rstto_image_dispose (GObject *object)
 {
     RsttoImage *image = RSTTO_IMAGE (object);
 
+    if(image->priv->cancellable)
+    {
+        g_cancellable_cancel (image->priv->cancellable);
+        g_object_unref (image->priv->cancellable);
+        image->priv->cancellable = NULL;
+    }
+
     if(image->priv->thumbnail)
     {
         g_object_unref (image->priv->thumbnail);
@@ -265,10 +274,15 @@ cb_rstto_image_read_file_ready (GObject *source_object, GAsyncResult *result, gp
 {
     GFile *file = G_FILE (source_object);
     RsttoImage *image = RSTTO_IMAGE (user_data);
-
     GFileInputStream *file_input_stream = g_file_read_finish (file, result, NULL);
+    
+    if (g_cancellable_is_cancelled (image->priv->cancellable))
+    {
+        g_object_unref (image);
+        return;
+    }
+
 
-    g_object_ref (image);
     g_input_stream_read_async (G_INPUT_STREAM (file_input_stream),
                                image->priv->buffer,
                                RSTTO_IMAGE_BUFFER_SIZE,
@@ -285,6 +299,12 @@ cb_rstto_image_read_input_stream_ready (GObject *source_object, GAsyncResult *re
     gssize read_bytes = g_input_stream_read_finish (G_INPUT_STREAM (source_object), result, NULL);
     GError *error = NULL;
 
+    if (g_cancellable_is_cancelled (image->priv->cancellable))
+    {
+        g_object_unref (image);
+        return;
+    }
+
     if (image->priv->loader == NULL)
         return;
 
@@ -353,6 +373,8 @@ rstto_image_load (RsttoImage *image, gboolean empty_cache, guint max_size, gbool
 
     cache = rstto_image_cache_new ();
 
+    g_cancellable_reset (image->priv->cancellable);
+
     /* NEW */
     image->priv->max_size = max_size;
 
@@ -381,6 +403,7 @@ rstto_image_load (RsttoImage *image, gboolean empty_cache, guint max_size, gbool
         /*g_signal_connect(image->priv->loader, "area-updated", G_CALLBACK(cb_rstto_image_area_updated), image);*/
         g_signal_connect(image->priv->loader, "closed", G_CALLBACK(cb_rstto_image_closed), image);
 
+        g_object_ref (image);
 	    g_file_read_async (image->priv->file, 0, NULL, (GAsyncReadyCallback)cb_rstto_image_read_file_ready, image);
     }
     else
@@ -403,6 +426,8 @@ rstto_image_unload (RsttoImage *image)
 {
     g_return_if_fail (image != NULL);
 
+    g_cancellable_cancel (image->priv->cancellable);
+
     if (image->priv->loader)
     {
         gdk_pixbuf_loader_close (image->priv->loader, NULL);