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

[From: subversion at stage.maemo.org]

Author: novo
Date: 2008-04-09 16:07:03 +0300 (Wed, 09 Apr 2008)
New Revision: 15373

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/real-af-base-apps
Log:
  * Ensure controlpanel is not running while the device is in charging mode
    Fixes NB#83038


Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-04-09 09:16:58 UTC (rev 15372)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-04-09 13:07:03 UTC (rev 15373)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.52)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.53)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-04-09 09:16:58 UTC (rev 15372)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-04-09 13:07:03 UTC (rev 15373)
@@ -1,3 +1,10 @@
+osso-af-startup (1.53-1) unstable; urgency=low
+
+  * Ensure controlpanel is not running while the device is in charging mode
+    Fixes NB#83038
+
+ -- Karl Lattimer <karl.lattimer at nokia.com>  Wed,  9 Apr 2008 16:01:57 +0300 
+
 osso-af-startup (1.52-1) unstable; urgency=low
 
   * Patch from Leonid Moiseichuk

Modified: projects/haf/trunk/osso-af-startup/services/real-af-base-apps
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-base-apps	2008-04-09 09:16:58 UTC (rev 15372)
+++ projects/haf/trunk/osso-af-startup/services/real-af-base-apps	2008-04-09 13:07:03 UTC (rev 15373)
@@ -54,6 +54,12 @@
   source $AF_INIT_DIR/clipboard.sh stop
   source $AF_INIT_DIR/keyboard.sh stop
 
+  # Kill controlpanel if it is still running, fixes NB#83038
+  CPANELPID=`pidof controlpanel`
+  if [ "x$CPANELPID" != "x" ]; then
+    kill $CPANELPID
+  fi
+
   if [ -x $CONNECTIVITY_UI_SCRIPT ]; then
     source $CONNECTIVITY_UI_SCRIPT stop
   fi