callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be more careful when calling g_propagate_error(). (#453365, Michael

Browse Source 
2007-07-03  Matthias Clasen  <mclasen@redhat.com>

        * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Be
        more careful when calling g_propagate_error().  (#453365,
        Michael Chudobiak)



svn path=/trunk/; revision=18357
This commit is contained in:
Matthias Clasen
2007-07-03 16:29:58 +00:00
committed by Matthias Clasen
parent c514f28409
commit 44f7b0657b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,9 @@
2007-07-03 Matthias Clasen <mclasen@redhat.com>
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Be
more careful when calling g_propagate_error(). (#453365,
Michael Chudobiak)
2007-07-02 Matthias Clasen <mclasen@redhat.com> 2007-07-02 Matthias Clasen <mclasen@redhat.com>
* === Released 2.11.5 === * === Released 2.11.5 ===

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

@ -723,8 +723,8 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
GError *tmp = NULL; GError *tmp = NULL;
if (!priv->image_module->stop_load (priv->context, &tmp) || tmp) if (!priv->image_module->stop_load (priv->context, &tmp) || tmp)
{ {
gdk_pixbuf_loader_ensure_error (loader, &tmp);
g_propagate_error (error, tmp); g_propagate_error (error, tmp);
gdk_pixbuf_loader_ensure_error (loader, error);
retval = FALSE; retval = FALSE;
} }
} }