[maemo-commits] [maemo-commits] r13553 - in projects/connectivity/osso-bluez-compat/trunk: . debian etc

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-09-03 12:10:26 +0300 (Mon, 03 Sep 2007)
New Revision: 13553

Modified:
   projects/connectivity/osso-bluez-compat/trunk/configure.ac
   projects/connectivity/osso-bluez-compat/trunk/debian/changelog
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-cud.sh
Log:
Make sure bluetooth is enabled before calling osso-bluez-cud

Modified: projects/connectivity/osso-bluez-compat/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-09-03 08:33:54 UTC (rev 13552)
+++ projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-09-03 09:10:26 UTC (rev 13553)
@@ -1,4 +1,4 @@
-AC_INIT([osso-bluez-compat],[0.10])
+AC_INIT([osso-bluez-compat],[0.11])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-bluez-compat/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-09-03 08:33:54 UTC (rev 13552)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-09-03 09:10:26 UTC (rev 13553)
@@ -1,3 +1,9 @@
+osso-bluez-compat (0.11) unstable; urgency=low
+
+  * Make sure bluetooth is enabled when calling CUD script. Fixes: NB#66106 
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Mon,  3 Sep 2007 12:08:24 +0300
+
 osso-bluez-compat (0.10) unstable; urgency=low
 
   *  Fix syntax in backup script. Fixes: NB#61324

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-cud.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-cud.sh	2007-09-03 08:33:54 UTC (rev 13552)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-cud.sh	2007-09-03 09:10:26 UTC (rev 13553)
@@ -1,3 +1,11 @@
 #!/bin/sh
 
+MODE=`dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.GetMode|tail -1|awk '{ print $2 }'|sed s/\"//g`
+
+dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:connectable > /dev/null
+
 /usr/bin/osso-bluez-cud
+
+if [ "$MODE" ]; then
+	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE > /dev/null
+fi