diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-07-03 16:29:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-07-03 16:29:58 +0000 |
| commit | 44f7b0657b75f430708fba2616503492b3052be5 (patch) | |
| tree | 0b157f8a6d9d9f44e715899de9db05eb3988e0f3 /gdk-pixbuf | |
| parent | c514f28409f12fe427e8d6d2f1587513622dfd64 (diff) | |
| download | gtk+-44f7b0657b75f430708fba2616503492b3052be5.tar.gz | |
Be more careful when calling g_propagate_error(). (#453365, Michael
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
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 6 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-loader.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index a2f8a51a9d..66f0d40da8 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -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> * === Released 2.11.5 === diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index d1721451c4..130608fb3e 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -723,8 +723,8 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader, GError *tmp = NULL; if (!priv->image_module->stop_load (priv->context, &tmp) || tmp) { + gdk_pixbuf_loader_ensure_error (loader, &tmp); g_propagate_error (error, tmp); - gdk_pixbuf_loader_ensure_error (loader, error); retval = FALSE; } } |