# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: geoffrey.antos@gmail.com-20080807194437-\
#   7w2jkmrqw857kigv
# target_branch: ../upstream/
# testament_sha1: 676a671dd535b1f8feac95708211355817a6a6f2
# timestamp: 2008-08-07 12:45:35 -0700
# source_branch: .
# base_revision_id: geoffrey.antos@gmail.com-20080807181524-\
#   0u5cond0cps7e9kz
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2008-08-07 18:15:24 +0000
+++ ChangeLog	2008-08-07 19:44:37 +0000
@@ -1,4 +1,8 @@
 2008-08-07  Geoffrey Antos <dynamotwain@aim.com>
+	* libgthumb/image-viewer-image.c: (image_viewer_image_get_path):
+		Fix a NULL-dereference.
+
+2008-08-07  Geoffrey Antos <dynamotwain@aim.com>
 	* libgthumb/image-viewer.c: (set_pixbuf__step2),
 	(create_image), (image_loaded):
 		Do not emit image_loaded signal when

=== modified file 'libgthumb/image-viewer-image.c'
--- libgthumb/image-viewer-image.c	2008-07-31 19:39:58 +0000
+++ libgthumb/image-viewer-image.c	2008-08-07 19:44:37 +0000
@@ -527,7 +527,10 @@
 
 	priv = IMAGE_VIEWER_IMAGE_GET_PRIVATE (image);
 
-	return g_strdup (priv->file->path);
+	if (priv->file)
+		return g_strdup (priv->file->path);
+	else
+		return NULL;
 }
 
 

