AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 517233 – Calling gdk_pixbuf_loader_close causes "GError set over the

Browse Source 
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


svn path=/trunk/; revision=21309
This commit is contained in:
Matthias Clasen 2008-09-07 05:19:29 +00:00 committed by Matthias Clasen
parent 6d64db6695
commit 827b7e6f66
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,11 @@
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
2008-09-05 Sebastien Bacher <seb128@ubuntu.com>
* gdk-pixbuf-io.c: (gdk_pixbuf_load_module_unlocked):

8
gdk-pixbuf/gdk-pixbuf-loader.c
View File

@ -726,8 +726,12 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
* 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;
}
}