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

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-08-13 15:14:40 +0300 (Mon, 13 Aug 2007)
New Revision: 13153

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-rfs.sh
Log:
Make sure that the adapter is UP before sending commands. Fixes: NB#50798

Modified: projects/connectivity/osso-bluez-compat/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-08-13 11:54:14 UTC (rev 13152)
+++ projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-08-13 12:14:40 UTC (rev 13153)
@@ -1,4 +1,4 @@
-AC_INIT([osso-bluez-compat],[0.7])
+AC_INIT([osso-bluez-compat],[0.8])
 
 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-08-13 11:54:14 UTC (rev 13152)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-08-13 12:14:40 UTC (rev 13153)
@@ -1,3 +1,9 @@
+osso-bluez-compat (0.8) unstable; urgency=low
+
+  * Make sure that the adapter is UP before sending commands. Fixes: NB#50798 
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 13 Aug 2007 15:13:31 +0300
+
 osso-bluez-compat (0.7) unstable; urgency=low
 
   * Don't use hciconfig in backup restore script. Fixes: NB#65371 

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh	2007-08-13 11:54:14 UTC (rev 13152)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh	2007-08-13 12:14:40 UTC (rev 13153)
@@ -8,10 +8,12 @@
 elif [ -f $AF_DEFINES ]; then
 	. $AF_DEFINES
 	if [ "$OSSO_PRODUCT_NAME" ]; then
-		PRODUCT_NAME="$Nokia $OSSO_PRODUCT_NAME"
+		PRODUCT_NAME="Nokia $OSSO_PRODUCT_NAME"
 	fi
 fi
 
+dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:connectable > /dev/null
+
 dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$PRODUCT_NAME"
 dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetDiscoverableTimeout uint32:0
 dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:off