[maemo-commits] [maemo-commits] r18204 - in projects/connectivity/maemo-bluez-compat/trunk: etc src

[From: subversion at stage.maemo.org]

Author: jh
Date: 2009-04-30 13:04:56 +0300 (Thu, 30 Apr 2009)
New Revision: 18204

Modified:
   projects/connectivity/maemo-bluez-compat/trunk/etc/bluez-cud.sh
   projects/connectivity/maemo-bluez-compat/trunk/src/maemo-bluez-cud
Log:
Fix CUD script to restore original settings as well

Modified: projects/connectivity/maemo-bluez-compat/trunk/etc/bluez-cud.sh
===================================================================
--- projects/connectivity/maemo-bluez-compat/trunk/etc/bluez-cud.sh	2009-04-30 10:04:55 UTC (rev 18203)
+++ projects/connectivity/maemo-bluez-compat/trunk/etc/bluez-cud.sh	2009-04-30 10:04:56 UTC (rev 18204)
@@ -1,3 +1,15 @@
 #!/bin/sh
 
-/usr/bin/maemo-bluez-cud
+AF_DEFINES="/etc/osso-af-init/af-defines.sh"
+PRODUCT_NAME="Nokia NXX"
+
+if [ "$OSSO_PRODUCT_NAME" ]; then
+	PRODUCT_NAME="Nokia $OSSO_PRODUCT_NAME"
+elif [ -f $AF_DEFINES ]; then
+	. $AF_DEFINES
+	if [ "$OSSO_PRODUCT_NAME" ]; then
+		PRODUCT_NAME="Nokia $OSSO_PRODUCT_NAME"
+	fi
+fi
+
+/usr/bin/maemo-bluez-cud "$PRODUCT_NAME"

Modified: projects/connectivity/maemo-bluez-compat/trunk/src/maemo-bluez-cud
===================================================================
--- projects/connectivity/maemo-bluez-compat/trunk/src/maemo-bluez-cud	2009-04-30 10:04:55 UTC (rev 18203)
+++ projects/connectivity/maemo-bluez-compat/trunk/src/maemo-bluez-cud	2009-04-30 10:04:56 UTC (rev 18204)
@@ -1,12 +1,18 @@
 #!/usr/bin/python2.5
 
 import dbus
+import sys
 
+if len(sys.argv) < 2:
+	print "Usage: %s <product name>" % sys.argv[0]
+	sys.exit(1)
+
 bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
 adapter = dbus.Interface(bus.get_object("org.bluez", manager.DefaultAdapter()),
 							"org.bluez.Adapter")
+
 properties = adapter.GetProperties()
 powered = properties["Powered"]
 
@@ -16,5 +22,7 @@
 for device in properties["Devices"]:
 	adapter.RemoveDevice(device)
 
-if not powered:
-	adapter.SetProperty("Powered", False)
+adapter.SetProperty("Name", sys.argv[1])
+adapter.SetProperty("Discoverable", False)
+adapter.SetProperty("DiscoverableTimeout", dbus.UInt32(0))
+adapter.SetProperty("Powered", False)