diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2001-08-30 07:23:32 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2001-08-30 07:23:32 +0000 |
| commit | 5021904329309bb8b1c8c4ada7ffc61eb934625e (patch) | |
| tree | def657ca579f879546fd965ec7b6f7afae556c6c /gdk-pixbuf | |
| parent | 29c0d6fa326af4ff6faad1b782cd9e6c208d3275 (diff) | |
| download | gdk-pixbuf-5021904329309bb8b1c8c4ada7ffc61eb934625e.tar.gz | |
gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Propagate
errors from gdk_pixbuf_loader_load_module.
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-loader.c | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 0b0a71e0c..5c1fc08b3 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 30 08:30:03 2001 Matthias Clasen <matthiasc@poet.de> + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Propagate + errors from gdk_pixbuf_loader_load_module. + Thu Aug 30 08:27:37 2001 Matthias Clasen <matthiasc@poet.de> * io-png.c (png_row_callback): Check that row_num is valid. diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index 77c8ea889..0149357b2 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -529,9 +529,16 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader, /* We have less the 128 bytes in the image. Flush it, and keep going. */ if (priv->image_module == NULL) - gdk_pixbuf_loader_load_module (loader, NULL, NULL); - - if (priv->image_module && priv->image_module->stop_load && priv->context) + { + GError *tmp = NULL; + gdk_pixbuf_loader_load_module (loader, NULL, &tmp); + if (tmp != NULL) + { + g_propagate_error (error, tmp); + retval = FALSE; + } + } + if (retval && priv->image_module && priv->image_module->stop_load && priv->context) retval = priv->image_module->stop_load (priv->context, error); priv->closed = TRUE; @@ -540,3 +547,5 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader, return retval; } + + |