[Xfce4-commits] <tumbler:master> Do nothing in case of cancelled before we started

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 90907b595599f1c11f39c724feba2cc25e62039f (commit)
       from 97da0eef20a52f9942260dc16a1c751f2a895a20 (commit)

commit 90907b595599f1c11f39c724feba2cc25e62039f
Author: Philip Van Hoof <philip at codeminded.be>
Date:   Thu Oct 15 14:27:16 2009 +0200

    Do nothing in case of cancelled before we started
    
    Signed-off-by: Jannis Pohlmann <jannis at xfce.org>

 plugins/font-thumbnailer/font-thumbnailer.c     |    4 ++++
 plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/plugins/font-thumbnailer/font-thumbnailer.c b/plugins/font-thumbnailer/font-thumbnailer.c
index d7a1f96..1138833 100644
--- a/plugins/font-thumbnailer/font-thumbnailer.c
+++ b/plugins/font-thumbnailer/font-thumbnailer.c
@@ -460,6 +460,10 @@ font_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   g_return_if_fail (IS_FONT_THUMBNAILER (thumbnailer));
   g_return_if_fail (uri != NULL && *uri != '\0');
 
+  /* do nothing if cancelled */
+  if (g_cancellable_is_cancelled (cancellable)) 
+    return;
+
   /* check if we have a valid freetype library object */
   if (font_thumbnailer->library_error != 0)
     {
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
index 06b1198..ee7fade 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
@@ -162,6 +162,10 @@ pixbuf_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   g_return_if_fail (IS_PIXBUF_THUMBNAILER (thumbnailer));
   g_return_if_fail (uri != NULL && *uri != '\0');
 
+  /* do nothing if cancelled */
+  if (g_cancellable_is_cancelled (cancellable)) 
+    return;
+ 
   /* create the file info for this URI */
   info = tumbler_file_info_new (uri);