diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-09-07 05:19:29 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-09-07 05:19:29 +0000 |
| commit | 827b7e6f6686aa9206cf142c6aff4df74fe48ad8 (patch) | |
| tree | 9a85c5fa7b46a02a552a9afe120b59bde963ea82 /gdk-pixbuf | |
| parent | 6d64db6695cc87c778ee20848e4e43efe5bcac49 (diff) | |
| download | gtk+-827b7e6f6686aa9206cf142c6aff4df74fe48ad8.tar.gz | |
Bug 517233 – Calling gdk_pixbuf_loader_close causes "GError set over the
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
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 8 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-loader.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index eb46945d44..9d5f62a152 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -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): diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index ce6dc411d7..9ec8125997 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -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; } } |