gtk+ r21309 - trunk/gdk-pixbuf

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Sep  7 05:19:29 2008
New Revision: 21309
URL: http://svn.gnome.org/viewvc/gtk+?rev=21309&view=rev

Log:
2008-09-06  Matthias Clasen  <mclasen redhat com>

        Bug 517233 â Calling gdk_pixbuf_loader_close causes "GError set over
        the top of a previous GError" warning

        * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Don't overwrite
        errors. Reported by Andrey Tsyvarev



Modified:
   trunk/gdk-pixbuf/ChangeLog
   trunk/gdk-pixbuf/gdk-pixbuf-loader.c

Modified: trunk/gdk-pixbuf/gdk-pixbuf-loader.c
==============================================================================
--- trunk/gdk-pixbuf/gdk-pixbuf-loader.c	(original)
+++ trunk/gdk-pixbuf/gdk-pixbuf-loader.c	Sun Sep  7 05:19:29 2008
@@ -726,8 +726,12 @@
  					 * here, since we might not get an error in the
  					 * gdk_pixbuf_get_file_info() case
  					 */
-					if (tmp)
-						g_propagate_error (error, tmp);
+					if (tmp) {
+						if (error && *error == NULL)
+							g_propagate_error (error, tmp);
+						else
+							g_error_free (tmp);
+					}
                                         retval = FALSE;
                                 }
                 }