From 98f9ba55e86442f860e828a54cf89c4ef4a70f98 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Fri, 13 Feb 2009 01:25:36 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20571576=20=E2=80=93=20gdk=5Fpixbuf=5Fsave?= =?UTF-8?q?=5Fto=5Fstream()=20broken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2009-02-12 Cody Russell 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. svn path=/trunk/; revision=22322 --- ChangeLog | 8 ++++++++ gdk-pixbuf/gdk-pixbuf-io.c | 11 ++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77a3dea859..c72ecf0219 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-02-12 Cody Russell + + 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. + 2009-02-12 Marek Kasik Bug 568571 – Asian am/pm format on cups print backend's time parsing diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 641e747513..b1b9be24bd 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -2406,13 +2406,10 @@ gdk_pixbuf_save_to_stream (GdkPixbuf *pixbuf, 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);