[maemo-commits] [maemo-commits] r19320 - in projects/haf/trunk/hildon-initscripts: . debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-09-10 15:25:19 +0300 (Thu, 10 Sep 2009)
New Revision: 19320

Modified:
   projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in
   projects/haf/trunk/hildon-initscripts/configure.ac
   projects/haf/trunk/hildon-initscripts/debian/changelog
Log:
Start hildon-status-menu manually

Modified: projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in
===================================================================
--- projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in	2009-09-10 12:09:54 UTC (rev 19319)
+++ projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in	2009-09-10 12:25:19 UTC (rev 19320)
@@ -149,7 +149,12 @@
 if [ "$STOP" = "TRUE" ]; then
 
   af_sb_service keyboard        stop
-  af_sb_init_service hildon-status-menu stop
+
+  HILDON_STATUS_MENU_PID=$(pidof hildon-status-menu)
+  if test "x$HILDON_STATUS_MENU_PID" != "x"; then
+    kill $HILDON_STATUS_MENU_PID
+  fi
+
   af_sb_init_service hildon-desktop stop
   af_sb_service sapwood-server  stop
   af_sb_service dbus-sessionbus stop
@@ -241,7 +246,9 @@
   af_sb_init_service hildon-desktop start
 
   # start hildon-status-menu
-  af_sb_init_service hildon-status-menu start
+  if test -x /usr/bin/hildon-status-menu; then
+    /usr/bin/hildon-status-menu &
+  fi
 
   # start hildon-home
   if test -x /usr/bin/hildon-home; then

Modified: projects/haf/trunk/hildon-initscripts/configure.ac
===================================================================
--- projects/haf/trunk/hildon-initscripts/configure.ac	2009-09-10 12:09:54 UTC (rev 19319)
+++ projects/haf/trunk/hildon-initscripts/configure.ac	2009-09-10 12:25:19 UTC (rev 19320)
@@ -1,4 +1,4 @@
-AC_INIT([hildon-initscripts], [1.23])
+AC_INIT([hildon-initscripts], [1.26])
 AC_CONFIG_SRCDIR([run-standalone.sh])
 
 AM_INIT_AUTOMAKE

Modified: projects/haf/trunk/hildon-initscripts/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/changelog	2009-09-10 12:09:54 UTC (rev 19319)
+++ projects/haf/trunk/hildon-initscripts/debian/changelog	2009-09-10 12:25:19 UTC (rev 19320)
@@ -2,6 +2,8 @@
 
   [ Peter Csaszar ]
   * bump
+  [ Gabriel Schulhof ]
+  * Fixes:NB#137740 (af-sb-init.sh needs changes for starting and stopping hildon-status-menu)
 
  -- Peter Csaszar <csjpeter at gmail.com>  Thu, 11 Jun 2009 14:08:30 +0200