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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-01-14 13:45:33 +0200 (Wed, 14 Jan 2009)
New Revision: 17172

Modified:
   projects/haf/trunk/osso-app-killer/debian/changelog
   projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh
Log:
Remove BT reset code from osso-app-killer-common.sh

Modified: projects/haf/trunk/osso-app-killer/debian/changelog
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/changelog	2009-01-14 11:00:14 UTC (rev 17171)
+++ projects/haf/trunk/osso-app-killer/debian/changelog	2009-01-14 11:45:33 UTC (rev 17172)
@@ -1,3 +1,10 @@
+osso-app-killer (1.26-1) unstable; urgency=low
+
+  * SUW code is unnecessary. It should be done by SUW cud script.
+  * BT device name reset in osso-app-killer-common.sh is unnecessary. It should be done by cud and rfs scripts.
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 14 Jan 2009 13:35:24 +0200
+
 osso-app-killer (1.25-1) unstable; urgency=low
 
   * Ooops! Forgot to add code removing SUW state so as to ensure SUW start on next reboot

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-14 11:00:14 UTC (rev 17171)
+++ projects/haf/trunk/osso-app-killer/src/osso-app-killer-common.sh	2009-01-14 11:45:33 UTC (rev 17172)
@@ -24,25 +24,6 @@
 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_SHORT_NAME`
-else
-  NAME='Nokia N800'
-fi
-
-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