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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-02-14 16:47:00 +0200 (Sat, 14 Feb 2009)
New Revision: 17425

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
   projects/haf/trunk/ke-recv/src/ke-recv.h
Log:
disabled AM auto-start and 'memory card available' banner


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-02-14 12:25:18 UTC (rev 17424)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-02-14 14:47:00 UTC (rev 17425)
@@ -4,6 +4,8 @@
   * Now installing /etc/event.d/ke-recv Upstart script. Fixes: NB#101496
   * Move GConf schema file from /etc/gconf/schemas to
     /usr/share/gconf/schemas.
+  * Disabled Application Manager auto-start feature.
+  * Disabled 'memory card available' banner. Fixes: NB#101300
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 13 Feb 2009 11:00:18 +0200
 

Modified: projects/haf/trunk/ke-recv/src/events.c
===================================================================
--- projects/haf/trunk/ke-recv/src/events.c	2009-02-14 12:25:18 UTC (rev 17424)
+++ projects/haf/trunk/ke-recv/src/events.c	2009-02-14 14:47:00 UTC (rev 17425)
@@ -986,11 +986,13 @@
                                 init_mmc_volumes(mmc);
                                 update_mmc_label(mmc);
                                 if (mount_volumes(mmc)) {
+                                        /*
                                         display_dialog(
                                                 MSG_MEMORY_CARD_AVAILABLE);
                                         if (desktop_started) {
                                                 check_install_file(mmc);
                                         }
+                                                */
                                 }
                         }
                         mmc->state = S_COVER_CLOSED;
@@ -1179,6 +1181,7 @@
                         if (ignore_cable || !in_mass_storage_mode()) {
                                 update_mmc_label(mmc);
                                 if (mount_volumes(mmc)) {
+                                        /*
                                         if (!mmc->skip_banner) {
                                                 display_dialog(
                                                  MSG_MEMORY_CARD_AVAILABLE);
@@ -1186,6 +1189,7 @@
                                         if (desktop_started) {
                                                 check_install_file(mmc);
                                         }
+                                        */
                                 }
                         }
                         if (mmc->skip_banner) mmc->skip_banner = FALSE;

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2009-02-14 12:25:18 UTC (rev 17424)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2009-02-14 14:47:00 UTC (rev 17425)
@@ -600,6 +600,7 @@
         return DBUS_HANDLER_RESULT_HANDLED;
 }
 
+#if 0
 int check_install_file(const mmc_info_t *mmc)
 {
         char buf[100];
@@ -621,12 +622,15 @@
         }
         return started;
 }
+#endif
 
 static void possibly_start_am(void)
 {
+        /*
         if (!check_install_file(&ext_mmc) && int_mmc_enabled) {
                 check_install_file(&int_mmc);
         }
+        */
 }
 
 /* Handler for checking for the .auto.install file on demand */

Modified: projects/haf/trunk/ke-recv/src/ke-recv.h
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.h	2009-02-14 12:25:18 UTC (rev 17424)
+++ projects/haf/trunk/ke-recv/src/ke-recv.h	2009-02-14 14:47:00 UTC (rev 17425)
@@ -302,7 +302,9 @@
 int in_mass_storage_mode(void);
 int in_peripheral_wait_mode(void);
 usb_state_t get_usb_state(void);
+/*
 int check_install_file(const mmc_info_t *mmc);
+*/
 
 #ifdef __cplusplus
 }