[maemo-commits] [maemo-commits] r18564 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-06-01 16:40:43 +0300 (Mon, 01 Jun 2009)
New Revision: 18564

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/src/events.c
   projects/haf/trunk/ke-recv/src/ke-recv.c
Log:
fix Bug 119012


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-06-01 13:24:49 UTC (rev 18563)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-06-01 13:40:43 UTC (rev 18564)
@@ -1,3 +1,13 @@
+ke-recv (3.18-1) unstable; urgency=low
+
+  * Don't check is_mounted before unmounting to speed up and simplify.
+  * Handle event (e.g. E_CLOSED) properly even if whole_device is not known
+    yet.
+  * Fixes: NB#119012 - Memory card doesn't shows up in File Manager once back
+    cover is removed and put back again
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 01 Jun 2009 16:38:26 +0300
+
 ke-recv (3.17-1) unstable; urgency=low
 
   * Do not log bogus error 'MP is not writable' in the external card mounting

Modified: projects/haf/trunk/ke-recv/src/events.c
===================================================================
--- projects/haf/trunk/ke-recv/src/events.c	2009-06-01 13:24:49 UTC (rev 18563)
+++ projects/haf/trunk/ke-recv/src/events.c	2009-06-01 13:40:43 UTC (rev 18564)
@@ -1029,6 +1029,7 @@
             volume_list_t *l;
             for (l = &mmc->volumes; l != NULL; l = l->next) {
                 if (l->udi != NULL) {
+#if 0  /* not necessary to check is_mounted, mountpoint should be enough */
                         int prop;
                         /* TODO: cache is_mounted info for speed */
                         prop = get_prop_bool(l->udi, "volume.is_mounted");
@@ -1044,6 +1045,7 @@
                                 }
                                 continue;
                         }
+#endif
                         if (l->mountpoint == NULL) {
                                 ULOG_DEBUG_F("mount point not known for %s",
                                              l->udi);
@@ -1444,7 +1446,6 @@
         int ret = 1;
         if (mmc->whole_device == NULL) {
                 ULOG_DEBUG_F("whole_device unknown for %s", mmc->name);
-                return ret;
         }
         switch (mmc->state) {
                 case S_COVER_OPEN:

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2009-06-01 13:24:49 UTC (rev 18563)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2009-06-01 13:40:43 UTC (rev 18564)
@@ -1901,7 +1901,6 @@
 
                 if (slide_keyboard_udi != NULL
                     && strcmp(slide_keyboard_udi, udi) == 0) {
-                        ULOG_DEBUG_F("SLIDE_KEYBOARD %d", val);
                         inform_slide_keyboard(val);
                 } else if (ext_mmc.cover_udi &&
                            strcmp(ext_mmc.cover_udi, udi) == 0) {