nautilus r15002 - trunk/eel

[alexl svn gnome org]

Author: alexl
Date: Tue Feb 24 10:16:33 2009
New Revision: 15002
URL: http://svn.gnome.org/viewvc/nautilus?rev=15002&view=rev

Log:
2009-02-24  Alexander Larsson  <alexl redhat com>

	* eel-background.c (eel_background_get_image_uri):
	Don't spew warning if there is no uri.



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

Modified: trunk/eel/eel-background.c
==============================================================================
--- trunk/eel/eel-background.c	(original)
+++ trunk/eel/eel-background.c	Tue Feb 24 10:16:33 2009
@@ -522,8 +522,10 @@
 	g_return_val_if_fail (EEL_IS_BACKGROUND (background), NULL);
 
 	filename = gnome_bg_get_filename (background->details->bg);
-	
-	return g_filename_to_uri (filename, NULL, NULL);
+	if (filename) {
+		return g_filename_to_uri (filename, NULL, NULL);
+	}
+	return NULL;
 }
 
 /* Use style->base as the default color instead of bg */