[gthumb: 58/129] fixed crash when an error occurs while loading an image

[Paolo Bacchilega <paobac src gnome org>]

commit b048fe576cdac7a5879a7aa9eebca6c214958fc3
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Apr 21 23:53:17 2011 +0200

    fixed crash when an error occurs while loading an image

 .../contact_sheet/gth-contact-sheet-creator.c      |    2 +-
 extensions/image_print/gth-load-image-info-task.c  |    4 ++--
 extensions/webalbums/gth-web-exporter.c            |    2 +-
 gthumb/gth-image-preloader.c                       |    8 ++++----
 gthumb/gth-overwrite-dialog.c                      |    2 +-
 gthumb/gth-thumb-loader.c                          |    4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/extensions/contact_sheet/gth-contact-sheet-creator.c b/extensions/contact_sheet/gth-contact-sheet-creator.c
index fec4fec..888dca4 100644
--- a/extensions/contact_sheet/gth-contact-sheet-creator.c
+++ b/extensions/contact_sheet/gth-contact-sheet-creator.c
@@ -933,7 +933,7 @@ image_loader_ready_cb (GObject      *source_object,
 		       gpointer      user_data)
 {
 	GthContactSheetCreator *self = user_data;
-	GthImage               *image;
+	GthImage               *image = NULL;
 	GdkPixbuf              *pixbuf;
 	int                     original_width;
 	int                     original_height;
diff --git a/extensions/image_print/gth-load-image-info-task.c b/extensions/image_print/gth-load-image-info-task.c
index 8446287..d49c130 100644
--- a/extensions/image_print/gth-load-image-info-task.c
+++ b/extensions/image_print/gth-load-image-info-task.c
@@ -111,7 +111,7 @@ image_loader_ready_cb (GObject      *source_object,
 {
 	GthLoadImageInfoTask *self = user_data;
 	GthImageInfo         *image_info;
-	GthImage             *image;
+	GthImage             *image = NULL;
 	GError               *error = NULL;
 
 	gth_image_loader_load_finish (GTH_IMAGE_LOADER (source_object),
@@ -142,7 +142,7 @@ image_loader_ready_cb (GObject      *source_object,
 	else
 		g_clear_error (&error);
 
-	g_object_unref (image);
+	_g_object_unref (image);
 	continue_loading_image (self);
 }
 
diff --git a/extensions/webalbums/gth-web-exporter.c b/extensions/webalbums/gth-web-exporter.c
index b95ecb5..d17a1d4 100644
--- a/extensions/webalbums/gth-web-exporter.c
+++ b/extensions/webalbums/gth-web-exporter.c
@@ -2552,7 +2552,7 @@ image_loader_ready_cb (GObject      *source_object,
 {
 	GthWebExporter *self = user_data;
 	ImageData      *idata;
-	GthImage       *image;
+	GthImage       *image = NULL;
 	GdkPixbuf      *pixbuf;
 
 	if (! gth_image_loader_load_finish (GTH_IMAGE_LOADER (source_object),
diff --git a/gthumb/gth-image-preloader.c b/gthumb/gth-image-preloader.c
index 1f14ba1..a912c96 100644
--- a/gthumb/gth-image-preloader.c
+++ b/gthumb/gth-image-preloader.c
@@ -397,7 +397,7 @@ image_loader_ready_cb (GObject      *source_object,
 	LoadRequest        *load_request = user_data;
 	Preloader          *preloader = load_request->preloader;
 	GthImagePreloader  *self = preloader->self;
-	GthImage           *image;
+	GthImage           *image = NULL;
 	int                 original_width;
 	int                 original_height;
 	GError             *error = NULL;
@@ -415,16 +415,16 @@ image_loader_ready_cb (GObject      *source_object,
 	    || (preloader->token != self->priv->token))
 	{
 		load_request_free (load_request);
-		g_object_unref (image);
 		if (error != NULL)
 			g_error_free (error);
+		_g_object_unref (image);
 		return;
 	}
 
 	interval = NOT_REQUESTED_INTERVAL;
 
 	_g_object_unref (preloader->image);
-	preloader->image = g_object_ref (image);
+	preloader->image = _g_object_ref (image);
 	preloader->original_width = original_width;
 	preloader->original_height = original_height;
 	preloader->loaded = success;
@@ -462,7 +462,7 @@ image_loader_ready_cb (GObject      *source_object,
 		self->priv->load_id = g_timeout_add (interval, load_next, self);
 
 	load_request_free (load_request);
-	g_object_unref (image);
+	_g_object_unref (image);
 }
 
 
diff --git a/gthumb/gth-overwrite-dialog.c b/gthumb/gth-overwrite-dialog.c
index e34ed37..1ec5eb7 100644
--- a/gthumb/gth-overwrite-dialog.c
+++ b/gthumb/gth-overwrite-dialog.c
@@ -124,7 +124,7 @@ image_loader_ready_cb (GObject      *source_object,
 {
 	GthOverwriteDialog *self = user_data;
 	GError             *error = NULL;
-	GthImage           *image;
+	GthImage           *image = NULL;
 	GdkPixbuf          *pixbuf;
 	GtkWidget          *viewer;
 
diff --git a/gthumb/gth-thumb-loader.c b/gthumb/gth-thumb-loader.c
index 0e222d6..19e6ea7 100644
--- a/gthumb/gth-thumb-loader.c
+++ b/gthumb/gth-thumb-loader.c
@@ -428,7 +428,7 @@ cache_image_ready_cb (GObject      *source_object,
 {
 	LoadData       *load_data = user_data;
 	GthThumbLoader *self = load_data->thumb_loader;
-	GthImage       *image;
+	GthImage       *image = NULL;
 	GdkPixbuf      *pixbuf;
 	int             width;
 	int             height;
@@ -735,7 +735,7 @@ original_image_ready_cb (GObject      *source_object,
 {
 	LoadData       *load_data = user_data;
 	GthThumbLoader *self = load_data->thumb_loader;
-	GthImage       *image;
+	GthImage       *image = NULL;
 	GdkPixbuf      *pixbuf = NULL;
 	GError         *error = NULL;