[maemo-commits] [maemo-commits] r13996 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-09-21 16:05:48 +0300 (Fri, 21 Sep 2007)
New Revision: 13996

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c
Log:
resolved conflicts


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-21 13:05:14 UTC (rev 13995)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-21 13:05:48 UTC (rev 13996)
@@ -1,3 +1,9 @@
+2007-09-21  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+	* hildon-fm/hildon-file-system-voldev.c
+	(hildon_file_system_voldev_is_visible): Added support for GConf keys
+	mmc-cover-open and internal-mmc-cover-open. Fixes: NB#59490
+
 2007-09-21  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-selection.c

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-09-21 13:05:14 UTC (rev 13995)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-09-21 13:05:48 UTC (rev 13996)
@@ -1,6 +1,6 @@
 libhildonfm (1:1.9.40~unreleased) unstable; urgency=low
 
-  * Fixes: NB#63339, NB#63171.
+  * Fixes: NB#63339, NB#59490, NB#63171.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Mon, 17 Sep 2007 23:13:51 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c	2007-09-21 13:05:14 UTC (rev 13995)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c	2007-09-21 13:05:48 UTC (rev 13996)
@@ -36,6 +36,8 @@
 #define USED_OVER_USB_INTERNAL_KEY GCONF_PATH "/internal-mmc-used-over-usb"
 #define CORRUPTED_MMC_KEY GCONF_PATH "/mmc-corrupted"
 #define CORRUPTED_INTERNAL_MMC_KEY GCONF_PATH "/internal-mmc-corrupted"
+#define OPEN_MMC_COVER_KEY GCONF_PATH "/mmc-cover-open"
+#define OPEN_INTERNAL_MMC_COVER_KEY GCONF_PATH "/internal-mmc-cover-open"
 
 static void
 hildon_file_system_voldev_class_init (HildonFileSystemVoldevClass *klass);
@@ -166,7 +168,7 @@
           HILDON_FILE_SYSTEM_VOLDEV_GET_CLASS (voldev);
   gboolean visible = FALSE;
   GError *error = NULL;
-  gboolean value, corrupted;
+  gboolean value, corrupted, cover_open;
 
   if (!voldev->vol_type_valid)
     init_vol_type (location->basepath, voldev);
@@ -176,13 +178,17 @@
                                    USED_OVER_USB_INTERNAL_KEY, &error);
     corrupted = gconf_client_get_bool (klass->gconf,
 				       CORRUPTED_INTERNAL_MMC_KEY, &error);
+    cover_open = gconf_client_get_bool (klass->gconf,
+				        OPEN_INTERNAL_MMC_COVER_KEY, &error);
   } else if (voldev->vol_type == EXT_CARD) {
     value = gconf_client_get_bool (klass->gconf,
                                    USED_OVER_USB_KEY, &error);
     corrupted = gconf_client_get_bool (klass->gconf,
 				       CORRUPTED_MMC_KEY, &error);
+    cover_open = gconf_client_get_bool (klass->gconf,
+				        OPEN_MMC_COVER_KEY, &error);
   } else
-    value = corrupted = FALSE; /* USB_STORAGE */
+    value = corrupted = cover_open = FALSE; /* USB_STORAGE */
 
   if (error)
     {
@@ -195,11 +201,11 @@
   ULOG_DEBUG_F("%s type: %d, used_over_usb: %d", location->basepath,
                voldev->vol_type, voldev->used_over_usb);
 
-  if (voldev->volume && !voldev->used_over_usb)
+  if (voldev->volume && !voldev->used_over_usb && !cover_open)
     visible = gnome_vfs_volume_is_mounted (voldev->volume);
   else if (voldev->drive && voldev->vol_type == USB_STORAGE)
     visible = FALSE; /* USB drives are never visible */
-  else if (voldev->drive && !voldev->used_over_usb)
+  else if (voldev->drive && !voldev->used_over_usb && !cover_open)
     visible = (gnome_vfs_drive_is_connected (voldev->drive)
 	       && !gnome_vfs_drive_is_mounted (voldev->drive)
 	       && corrupted);