[maemo-commits] [maemo-commits] r14685 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-10-31 15:50:03 +0200 (Wed, 31 Oct 2007)
New Revision: 14685

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-10-31  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c: if an image has a cache, that's the file
	whose existence we should check. Fixes: NB#72925



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-31 11:58:45 UTC (rev 14684)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-31 13:50:03 UTC (rev 14685)
@@ -1,3 +1,8 @@
+2007-10-31  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-home-window.c: if an image has a cache, that's the file
+	whose existence we should check. Fixes: NB#72925
+
 2007-10-29  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 2.0.3

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-10-31 11:58:45 UTC (rev 14684)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-10-31 13:50:03 UTC (rev 14685)
@@ -420,11 +420,21 @@
      * exists. We don't test for non-local filesystems as it would be
      * too costly */
     const gchar *uri = hildon_desktop_background_get_filename (background);
+    const gchar *cache;
     gchar *filename = NULL;
 
-    if (uri[0] == '/')
+    g_object_get (background,
+                  "cache", &cache,
+                  NULL);
+
+    if (cache && cache[0] != '\0')
+      uri = cache;
+    else
+      uri = hildon_desktop_background_get_filename (background);
+
+    if (uri && uri[0] == '/')
       filename = g_strdup (uri);
-    else if (g_str_has_prefix (uri, "file://"))
+    else if (uri && g_str_has_prefix (uri, "file://"))
       filename = g_filename_from_uri (uri, NULL, NULL);
 
     if (filename)