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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-10-01 19:10:51 +0300 (Mon, 01 Oct 2007)
New Revision: 14245

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

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

	* src/hd-home-background.c (hd_home_background_requires_caching):
	- check for both MMC and cache the background for both origin,
	as both will be made unavailable if connected to a host.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-01 14:26:07 UTC (rev 14244)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-01 16:10:51 UTC (rev 14245)
@@ -1,25 +1,31 @@
-2007-09-28 Johan Bilien  <johan.bilien at nokia.com>
+2007-10-01  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-background.c (hd_home_background_requires_caching):
+	- check for both MMC and cache the background for both origin,
+	as both will be made unavailable if connected to a host.
+
+2007-10-01  Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-desktop-toggle-button.c
 	(hildon_desktop_toggle_button_expose): paint the button on
 	its allocation only. Fixes: NB#71538
 
-2007-09-28 Johan Bilien  <johan.bilien at nokia.com>
+2007-10-01  Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-desktop.c: removed debug message
 
-2007-09-28 Johan Bilien  <johan.bilien at nokia.com>
+2007-10-01  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-desktop-panel-expandable.c
 	(hildon_desktop_panel_expandable_hide_extension): do not hide the
 	extension if already hidden. In particular don't release grabs
 	which we didn't take. Fixes: NB#71191
 
-2007-09-28 Johan Bilien  <johan.bilien at nokia.com>
+2007-09-28  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 0.0.38
 
-2007-09-28 Johan Bilien  <johan.bilien at nokia.com>
+2007-09-28  Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-home-window.c: kill the startup wizard in an idle loop,
 	to make sure we are all setup.

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-background.c	2007-10-01 14:26:07 UTC (rev 14244)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-background.c	2007-10-01 16:10:51 UTC (rev 14245)
@@ -63,6 +63,7 @@
 #define HD_HOME_BACKGROUND_VALUE_CROPPED        "Cropped"
 
 #define HD_ENV_MMC_MOUNTPOINT                   "MMC_MOUNTPOINT"
+#define HD_ENV_SECOND_MMC_MOUNTPOINT            "INTERNAL_MMC_MOUNTPOINT"
 #define HD_HOME_BACKGROUND_CACHE_DIR             ".background-cache"
 
 struct _HDHomeBackgroundPrivate {
@@ -361,7 +362,7 @@
   gchar        *filename = NULL;
   const gchar  *mmc_mount_point;
   gchar        *mmc_mount_point_uri = NULL;
-  gboolean      on_internal_mmc = FALSE, on_external_fs = FALSE;
+  gboolean      on_first_mmc = FALSE, on_second_mmc = FALSE, on_external_fs = FALSE;
 
   g_object_get (background,
                 "filename", &filename,
@@ -373,25 +374,33 @@
     return FALSE;
 
   mmc_mount_point = g_getenv (HD_ENV_MMC_MOUNTPOINT);
-  mmc_mount_point_uri = g_strdup_printf ("file://%s", mmc_mount_point);
+  if (mmc_mount_point)
+  {
+    mmc_mount_point_uri = g_strdup_printf ("file://%s", mmc_mount_point);
 
-  if (mmc_mount_point &&
-      (g_str_has_prefix (filename, mmc_mount_point) ||
-       g_str_has_prefix (filename, mmc_mount_point_uri)))
-    on_internal_mmc = TRUE;
+    if (g_str_has_prefix (filename, mmc_mount_point) ||
+        g_str_has_prefix (filename, mmc_mount_point_uri))
+      on_first_mmc = TRUE;
 
-  g_free (mmc_mount_point_uri);
+    g_free (mmc_mount_point_uri);
+  }
 
+  mmc_mount_point = g_getenv (HD_ENV_SECOND_MMC_MOUNTPOINT);
+  if (mmc_mount_point)
+  {
+    mmc_mount_point_uri = g_strdup_printf ("file://%s", mmc_mount_point);
+
+    if (g_str_has_prefix (filename, mmc_mount_point) ||
+        g_str_has_prefix (filename, mmc_mount_point_uri))
+      on_second_mmc = TRUE;
+
+    g_free (mmc_mount_point_uri);
+  }
+
   on_external_fs = filename[0] != G_DIR_SEPARATOR &&
       (!g_str_has_prefix (filename, "file://"));
 
-#ifdef DEBUG
-  g_debug ("filename %s requires caching: %i",
-           filename,
-           (on_internal_mmc || on_external_fs));
-#endif
-  
-  return (on_internal_mmc || on_external_fs);
+  return (on_first_mmc || on_second_mmc || on_external_fs);
 
 
 }