eel r2115 - in trunk: . eel

[ssp svn gnome org]

Author: ssp
Date: Sat May 31 06:23:57 2008
New Revision: 2115
URL: http://svn.gnome.org/viewvc/eel?rev=2115&view=rev

Log:
Sat May 31 02:23:16 2008  SÃren Sandmann  <sandmann redhat com>

	* eel/eel-background.c (eel_background_reload_image): Deal with
	the case where image_uri is NULL.



Modified:
   trunk/ChangeLog
   trunk/eel/eel-background.c

Modified: trunk/eel/eel-background.c
==============================================================================
--- trunk/eel/eel-background.c	(original)
+++ trunk/eel/eel-background.c	Sat May 31 06:23:57 2008
@@ -531,12 +531,17 @@
 static void
 eel_background_reload_image (EelBackground *background)
 {
-	char *filename = g_filename_from_uri (background->details->image_uri, NULL, NULL);
+	char *filename;
 
-	if (filename != NULL) {
-		gnome_bg_set_filename (background->details->bg, filename);
+	filename = NULL;
+	
+	if (background->details->image_uri != NULL) {
+		filename = g_filename_from_uri (background->details->image_uri,
+						NULL, NULL);
 	}
 
+	gnome_bg_set_filename (background->details->bg, filename);
+
 	g_free (filename);
 }