[Xfce4-commits] [xfce/tumbler] 01/02: Revert "Fix setting internal error to NULL in pixbuf thumbnailer (bug #10878)"

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

nick pushed a commit to branch master
in repository xfce/tumbler.

commit c3e02db7ad2d6466c7678a293ed4e5f48695a47e
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jul 28 18:15:34 2014 +0200

    Revert "Fix setting internal error to NULL in pixbuf thumbnailer (bug #10878)"
    
    This reverts commit dc74b5d38009a5f6c1064f69d8b7d632ae0b52a5.
---
 plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
index 1196654..9c64659 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
@@ -164,8 +164,7 @@ pixbuf_thumbnailer_new_from_stream (GInputStream      *stream,
       if (n_read < 0)
         {
           result = FALSE;
-          if (error != NULL)
-            *error = NULL;
+          error = NULL;
           break;
         }
 
@@ -175,8 +174,7 @@ pixbuf_thumbnailer_new_from_stream (GInputStream      *stream,
       if (!gdk_pixbuf_loader_write (loader, buffer, n_read, error))
         {
           result = FALSE;
-          if (error != NULL)
-            *error = NULL;
+          error = NULL;
           break;
         }
     }
@@ -184,8 +182,7 @@ pixbuf_thumbnailer_new_from_stream (GInputStream      *stream,
   if (!gdk_pixbuf_loader_close (loader, error))
     {
       result = FALSE;
-      if (error != NULL)
-        *error = NULL;
+      error = NULL;
     }
 
   if (result)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.