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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-02-26 14:11:49 +0200 (Thu, 26 Feb 2009)
New Revision: 17526

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:
commit


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-02-26 08:43:29 UTC (rev 17525)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-02-26 12:11:49 UTC (rev 17526)
@@ -24,6 +24,7 @@
     unusable default value.
   * Handle "UNDEFINED" value for 'usb_device.mode' when switching modules and
     the USB cable is connected.
+  * Verified that bug 100593 is not reproducable. Fixes: NB#100593
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 24 Feb 2009 08:25:34 +0200
 

Modified: projects/haf/trunk/ke-recv/src/events.c
===================================================================
--- projects/haf/trunk/ke-recv/src/events.c	2009-02-26 08:43:29 UTC (rev 17525)
+++ projects/haf/trunk/ke-recv/src/events.c	2009-02-26 12:11:49 UTC (rev 17526)
@@ -608,9 +608,11 @@
         args[0] = dev;
         if (load_usb_driver(args)) {
                 ULOG_INFO_F("USB mass storage module loaded for %s", dev);
+                /*
                 if (show) {
                         display_dialog(MSG_DEVICE_CONNECTED_VIA_USB);
                 }
+                */
                 inform_mmc_used_over_usb(TRUE, mmc);
         } else {
                 ULOG_ERR_F("failed to load USB mass storage module for %s",

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2009-02-26 08:43:29 UTC (rev 17525)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2009-02-26 12:11:49 UTC (rev 17526)
@@ -2779,7 +2779,9 @@
         if (ext_mmc.whole_device == NULL
             && int_mmc.whole_device == NULL) {
                 ULOG_DEBUG_F("no cards inserted");
+                /*
                 display_system_note(MSG_NO_MEMORY_CARD_INSERTED);
+                */
                 return;
         }
 
@@ -2789,7 +2791,8 @@
                  * first available drive letter in Windows */
                 ir = handle_event(E_PLUGGED, &int_mmc, NULL);
         }
-        er = handle_event(E_PLUGGED, &ext_mmc, NULL);
+        if (ext_mmc.whole_device)
+                er = handle_event(E_PLUGGED, &ext_mmc, NULL);
 
         if (!er && !ir) {
                 show_usb_sharing_failed_dialog(&int_mmc, &ext_mmc);
@@ -2797,6 +2800,9 @@
                 show_usb_sharing_failed_dialog(NULL, &ext_mmc);
         } else if (!ir) {
                 show_usb_sharing_failed_dialog(&int_mmc, NULL);
+        } else if (ext_mmc.whole_device && int_mmc.whole_device) {
+                /* both succeeded */
+                display_dialog(MSG_DEVICE_CONNECTED_VIA_USB);
         }
 }