[maemo-commits] [maemo-commits] r17145 - in projects/haf/trunk/osso-app-killer: . debian src

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-01-13 11:08:23 +0200 (Tue, 13 Jan 2009)
New Revision: 17145

Modified:
   projects/haf/trunk/osso-app-killer/debian/changelog
   projects/haf/trunk/osso-app-killer/osso-app-killer.sudoers
   projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh
   projects/haf/trunk/osso-app-killer/src/osso-app-killer-cud.sh
   projects/haf/trunk/osso-app-killer/src/osso-app-killer-rfs.sh
Log:
Changes for Fremantle

Modified: projects/haf/trunk/osso-app-killer/debian/changelog
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/changelog	2009-01-12 21:52:06 UTC (rev 17144)
+++ projects/haf/trunk/osso-app-killer/debian/changelog	2009-01-13 09:08:23 UTC (rev 17145)
@@ -1,3 +1,9 @@
+osso-app-killer (1.24-1) unstable; urgency=low
+
+  * Fixing scripts for Fremantle
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon, 12 Jan 2009 14:04:11 +0200
+
 osso-app-killer (1.23-1) unstable; urgency=low
 
   * Fixes: NB#86990

Modified: projects/haf/trunk/osso-app-killer/osso-app-killer.sudoers
===================================================================
--- projects/haf/trunk/osso-app-killer/osso-app-killer.sudoers	2009-01-12 21:52:06 UTC (rev 17144)
+++ projects/haf/trunk/osso-app-killer/osso-app-killer.sudoers	2009-01-13 09:08:23 UTC (rev 17145)
@@ -5,3 +5,4 @@
 user ALL = NOPASSWD: /etc/init.d/hildon-desktop stop
 user ALL = NOPASSWD: /etc/init.d/mediaplayer-daemon stop
 user ALL = NOPASSWD: /etc/init.d/metalayer-crawler0 stop
+user ALL = NOPASSWD: /usr/bin/killall gconfd-2

Modified: projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh	2009-01-12 21:52:06 UTC (rev 17144)
+++ projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh	2009-01-13 09:08:23 UTC (rev 17145)
@@ -24,27 +24,34 @@
 DIR=/etc/osso-af-init
 DEFAULT_LOCALE_DIR=/usr/share/osso-af-init
 
+set_bluez4_device_name() # $1 = new device name
+{
+  DEFAULT_ADAPTER=$(dbus-send --print-reply --system --dest=org.bluez / org.bluez.Manager.DefaultAdapter | awk -F '"' {'if ($2 != "") print $2;'})
+  if test "x$DEFAULT_ADAPTER" != "x"; then
+    dbus-send --print-reply --system --dest=org.bluez $DEFAULT_ADAPTER org.bluez.Adapter.SetProperty string:Name variant:string:"$1"
+  fi
+}
+
 # reset the Bluetooth name
 if [ -x /usr/bin/osso-product-info ]; then
-  NAME=`/usr/bin/osso-product-info -qOSSO_PRODUCT_NAME`
+  NAME=`/usr/bin/osso-product-info -qOSSO_PRODUCT_SHORT_NAME`
 else
   NAME='Nokia N800'
 fi
-dbus-send --system --dest=org.bluez /org/bluez/hci0 \
-  org.bluez.Adapter.SetName string:"$NAME"
 
+if ! dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$NAME"; then
+  set_bluez4_device_name "$NAME"
+fi
+
 if [ "x$CUD" != "x" ]; then
   # restore the original language
   cat $DEFAULT_LOCALE_DIR/locale.orig > $DIR/locale
-  USER=`whoami`
   if test $(id -u) -eq 0; then
     chown user:users $DIR/locale
   fi
 fi
 
-# ask MCE to reboot the system
-dbus-send --system --type=method_call \
-  --dest="com.nokia.mce" --print-reply \
-  "/com/nokia/mce/request" \
-  com.nokia.mce.request.req_reboot
+if ! dbus-send --system --type=method_call --dest="com.nokia.mce"  --print-reply "/com/nokia/mce/request"  com.nokia.mce.request.req_reboot; then
+     dbus-send --system --type=method_call --dest="com.nokia.dsme" --print-reply "/com/nokia/dsme/request" com.nokia.dsme.request.req_reboot
+fi
 exit 0

Modified: projects/haf/trunk/osso-app-killer/src/osso-app-killer-cud.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/osso-app-killer-cud.sh	2009-01-12 21:52:06 UTC (rev 17144)
+++ projects/haf/trunk/osso-app-killer/src/osso-app-killer-cud.sh	2009-01-13 09:08:23 UTC (rev 17145)
@@ -53,6 +53,9 @@
 fi
 $SUDO /etc/init.d/af-base-apps stop
 $SUDO $DIR/gconf-daemon.sh stop
+if ps ax | grep -v grep | grep -q gconfd-2; then
+  $SUDO /usr/bin/killall gconfd-2
+fi
 
 if [ "x$OSSO_CUD_DOES_NOT_DESTROY" = "x" ]; then
   # Remove all user data

Modified: projects/haf/trunk/osso-app-killer/src/osso-app-killer-rfs.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/osso-app-killer-rfs.sh	2009-01-12 21:52:06 UTC (rev 17144)
+++ projects/haf/trunk/osso-app-killer/src/osso-app-killer-rfs.sh	2009-01-13 09:08:23 UTC (rev 17145)
@@ -33,6 +33,9 @@
 # define AF-wide environment
 source $DIR/af-defines.sh
 sudo $DIR/gconf-daemon.sh stop
+if ps ax | grep -v grep | grep -q gconfd-2; then
+  $SUDO /usr/bin/killall gconfd-2
+fi
 
 # Remove user-modified settings
 if [ "x$OSSO_RFS_DOES_NOT_DESTROY" = "x" ]; then