[maemo-commits] [maemo-commits] r13137 - in projects/haf/trunk/osso-af-startup: debian services

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-08-13 10:24:32 +0300 (Mon, 13 Aug 2007)
New Revision: 13137

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/real-af-base-apps
   projects/haf/trunk/osso-af-startup/services/real-af-startup
Log:
start VKB and clipboard daemon always from real-af-startup


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-08-13 07:09:11 UTC (rev 13136)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-08-13 07:24:32 UTC (rev 13137)
@@ -3,6 +3,8 @@
   * UNRELEASED
   * Added dependency to osso-product-info.
   * Now using update-sudoers instead of writing to /etc/sudoers directly.
+  * VKB and clipboard daemon are now always started in real-af-startup.
+    Patch from Leonid. Fixes: NB#62677
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 13 Aug 2007 10:01:46 +0300
 

Modified: projects/haf/trunk/osso-af-startup/services/real-af-base-apps
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-base-apps	2007-08-13 07:09:11 UTC (rev 13136)
+++ projects/haf/trunk/osso-af-startup/services/real-af-base-apps	2007-08-13 07:24:32 UTC (rev 13137)
@@ -33,8 +33,6 @@
     source $CONNECTIVITY_UI_SCRIPT start
   fi
 
-  source $AF_INIT_DIR/keyboard.sh start
-  
   if [ -x /usr/bin/hwkbd-reconfig ]; then
 	  /usr/bin/hwkbd-reconfig
   fi
@@ -43,8 +41,6 @@
     $AF_INIT_DIR/osso-media-server.sh start &
   fi
 
-  source $AF_INIT_DIR/clipboard.sh start
-
   if [ -f /tmp/.check_auto_install ]; then
     dbus-send --system --dest=com.nokia.ke_recv --type=method_call \
       --print-reply /com/nokia/ke_recv/check_auto_install \
@@ -55,9 +51,6 @@
   ;;
 stop)
 
-  source $AF_INIT_DIR/clipboard.sh stop
-  source $AF_INIT_DIR/keyboard.sh stop
-
   if [ -x $CONNECTIVITY_UI_SCRIPT ]; then
     source $CONNECTIVITY_UI_SCRIPT stop
   fi

Modified: projects/haf/trunk/osso-af-startup/services/real-af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-startup	2007-08-13 07:09:11 UTC (rev 13136)
+++ projects/haf/trunk/osso-af-startup/services/real-af-startup	2007-08-13 07:24:32 UTC (rev 13137)
@@ -20,23 +20,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-start_input()
-{
-  # we need to start VKB for the wizard...
-  if [ -f $AF_INIT_DIR/keyboard.defs ]; then
-    source $AF_INIT_DIR/keyboard.defs
-  fi
-
-  source $AF_INIT_DIR/keyboard.sh start
-  # give VKB some time to start
-  sleep 1
-
-  # start clipboard daemon for the wizard
-  if [ -f $AF_INIT_DIR/clipboard.sh ]; then
-    source $AF_INIT_DIR/clipboard.sh start
-  fi
-}
-
 if [ -f /etc/osso-af-init/wizard-background-defs.sh ]; then
   source /etc/osso-af-init/wizard-background-defs.sh
 fi
@@ -79,6 +62,18 @@
     source $AF_INIT_DIR/startup-greeting.sh start
   fi
 
+  # we need to start VKB 
+  if [ -f $AF_INIT_DIR/keyboard.defs ]; then
+    source $AF_INIT_DIR/keyboard.defs
+  fi
+
+  source $AF_INIT_DIR/keyboard.sh start
+
+  # start clipboard daemon 
+  if [ -f $AF_INIT_DIR/clipboard.sh ]; then
+    source $AF_INIT_DIR/clipboard.sh start
+  fi
+
   if [ -e $HOME/first-boot-flag ]; then
     ADVANCE_STEPS=1
 
@@ -91,7 +86,6 @@
     fi
 
     if [ -x $AF_INIT_DIR/startup-wizard.sh ]; then
-      start_input
       wizback_method advance 1
       wizback_method set_progress_visible false
       source $AF_INIT_DIR/startup-wizard.sh start
@@ -171,7 +165,6 @@
     touch /tmp/.check_auto_install
   else
     if [ -x $AF_INIT_DIR/startup-wizard.sh ]; then
-      start_input
       source $AF_INIT_DIR/startup-wizard.sh start
     fi