gtk+ r22323 - in branches/gtk-2-14: . gdk-pixbuf

[bratsche svn gnome org]

Author: bratsche
Date: Fri Feb 13 01:27:08 2009
New Revision: 22323
URL: http://svn.gnome.org/viewvc/gtk+?rev=22323&view=rev

Log:
2009-02-12  Cody Russell  <bratsche gnome org>

        Bug 571576 â gdk_pixbuf_save_to_stream() broken

        * gdk-pixbuf/gdk-pixbuf-io.c: Fix gdk_pixbuf_save_to_stream() so that
        it does not always return FALSE (even when it succeeds), and also so
        that it does not set error to NULL when something goes wrong.



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gdk-pixbuf/gdk-pixbuf-io.c

Modified: branches/gtk-2-14/gdk-pixbuf/gdk-pixbuf-io.c
==============================================================================
--- branches/gtk-2-14/gdk-pixbuf/gdk-pixbuf-io.c	(original)
+++ branches/gtk-2-14/gdk-pixbuf/gdk-pixbuf-io.c	Fri Feb 13 01:27:08 2009
@@ -2406,13 +2406,10 @@
 	data.stream = stream;
 	data.cancellable = cancellable;
 
-	if (!gdk_pixbuf_save_to_callbackv (pixbuf, save_to_stream, 
-					   &data, type, 
-					   keys, values, 
-					   error)) {
-		error = NULL; /* Ignore further errors */
-		res = FALSE;
-	}
+	res = gdk_pixbuf_save_to_callbackv (pixbuf, save_to_stream, 
+					    &data, type, 
+					    keys, values, 
+					    error);
 
 	g_strfreev (keys);
 	g_strfreev (values);