gthumb r2407 - in trunk: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Thu Sep  4 14:39:51 2008
New Revision: 2407
URL: http://svn.gnome.org/viewvc/gthumb?rev=2407&view=rev

Log:
2008-09-04  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/catalog.c: (catalog_load_from_disk__common):
        Call g_propagate_error only when there is an error, to reduce
        needless warnings. Patch by Geoffrey Antos <dynamotwain aim com>.
        From bug #525482.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/catalog.c

Modified: trunk/libgthumb/catalog.c
==============================================================================
--- trunk/libgthumb/catalog.c	(original)
+++ trunk/libgthumb/catalog.c	Thu Sep  4 14:39:51 2008
@@ -319,7 +319,9 @@
         g_object_unref (dstream);
         g_object_unref (istream);
         g_object_unref (gfile);
-	g_propagate_error (gerror, error);
+	if (error != NULL) {
+		g_propagate_error (gerror, error);
+	}
 
 	catalog->list = g_list_reverse (catalog->list);