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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-23 17:59:29 +0300 (Thu, 23 Apr 2009)
New Revision: 18154

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/src/events.c
   projects/haf/trunk/ke-recv/src/events.h
   projects/haf/trunk/ke-recv/src/ke-recv.c
Log:
add missing infobanner


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-04-23 14:23:10 UTC (rev 18153)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-04-23 14:59:29 UTC (rev 18154)
@@ -3,6 +3,8 @@
   * Set the cover open GConf key on E_INIT_CARD.
   * Fixes: NB#105727 - Camera is not considering Lens cover as open, if
     battery cover is not present
+  * Fixes: NB#112647 - Wrong info banner displayed when Mass stoirage mode
+    connected while no external mmc card pressent and internal mmc in use.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 23 Apr 2009 14:19:41 +0300
 

Modified: projects/haf/trunk/ke-recv/src/events.c
===================================================================
--- projects/haf/trunk/ke-recv/src/events.c	2009-04-23 14:23:10 UTC (rev 18153)
+++ projects/haf/trunk/ke-recv/src/events.c	2009-04-23 14:59:29 UTC (rev 18154)
@@ -1209,6 +1209,11 @@
                          MSG_USB_MEMORY_CARDS_IN_USE,
                          ex->display_name);
                 display_system_note(buf);
+        } else if (!ex) {
+                /* internal card in use, no external card present */
+                snprintf(buf, MAX_MSG_LEN,
+                         MSG_USB_INT_MEMORY_CARD_IN_USE_NO_EXT);
+                display_dialog(buf);
         } else {
                 if (ext_failed) {
                         /* external card in use */

Modified: projects/haf/trunk/ke-recv/src/events.h
===================================================================
--- projects/haf/trunk/ke-recv/src/events.h	2009-04-23 14:23:10 UTC (rev 18153)
+++ projects/haf/trunk/ke-recv/src/events.h	2009-04-23 14:59:29 UTC (rev 18154)
@@ -121,7 +121,8 @@
 #define MSG_MEMORY_CARD_IS_CORRUPTED_INT _("card_ti_corrupted_device")
 #define MSG_MEMORY_CARD_IS_CORRUPTED _("card_ti_corrupted_card")
 #define MSG_FORMATTING_COMPLETE _("card_ib_formatting_complete")
-#define MSG_USB_MEMORY_CARD_IN_USE _("card_ni_usb_failed_card_in_use")
+#define MSG_USB_INT_MEMORY_CARD_IN_USE_NO_EXT \
+        _("card_ni_usb_failed_card_in_use")
 #define MSG_USB_MEMORY_CARDS_IN_USE _("card_ni_usb_failed_cards_in_use")
 
 #define MAX_MSG_LEN 500

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2009-04-23 14:23:10 UTC (rev 18153)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2009-04-23 14:59:29 UTC (rev 18154)
@@ -2823,18 +2823,26 @@
                  * first available drive letter in Windows */
                 ir = handle_event(E_PLUGGED, &int_mmc, NULL);
         }
-        if (ext_mmc.whole_device)
+        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, 0);
-        } else if (!er) {
-                show_usb_sharing_failed_dialog(NULL, &ext_mmc, 1);
-        } else if (!ir) {
-                show_usb_sharing_failed_dialog(NULL, &ext_mmc, 0);
-        } else if (ext_mmc.whole_device && int_mmc.whole_device) {
-                /* both succeeded */
-                display_dialog(_("cards_connected_via_usb"));
+                if (!er && !ir) {
+                        show_usb_sharing_failed_dialog(&int_mmc, &ext_mmc, 0);
+                } else if (!er) {
+                        show_usb_sharing_failed_dialog(NULL, &ext_mmc, 1);
+                } else if (!ir) {
+                        show_usb_sharing_failed_dialog(NULL, &ext_mmc, 0);
+                } else {
+                        /* both succeeded */
+                        display_dialog(_("cards_connected_via_usb"));
+                }
+        } else {
+                /* no external card inserted */
+                if (!ir) {
+                        show_usb_sharing_failed_dialog(&int_mmc, NULL, 0);
+                } else {
+                        display_dialog(_("cards_connected_via_usb"));
+                }
         }
 }