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

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-08-14 11:28:01 +0300 (Tue, 14 Aug 2007)
New Revision: 13172

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-restore.sh
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh
Log:
Use --print-reply for all dbus-send calls

Modified: projects/connectivity/osso-bluez-compat/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-08-13 17:56:20 UTC (rev 13171)
+++ projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-08-14 08:28:01 UTC (rev 13172)
@@ -1,4 +1,4 @@
-AC_INIT([osso-bluez-compat],[0.8])
+AC_INIT([osso-bluez-compat],[0.9])
 
 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 17:56:20 UTC (rev 13171)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-08-14 08:28:01 UTC (rev 13172)
@@ -1,3 +1,10 @@
+osso-bluez-compat (0.9) unstable; urgency=low
+
+  * Add --print-reply to all dbus-send calls too keep things properly
+    sychronized. Should finally fix the issues. Fixes: NB#50798 NB#61324
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Tue, 14 Aug 2007 11:23:10 +0300
+
 osso-bluez-compat (0.8) unstable; urgency=low
 
   * Make sure that the adapter is UP before sending commands. Fixes: NB#50798 

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-08-13 17:56:20 UTC (rev 13171)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-08-14 08:28:01 UTC (rev 13172)
@@ -39,7 +39,7 @@
 fi
 
 if [ "$NAME" ]; then
-	dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$NAME"
+	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$NAME" > /dev/null
 fi
 
 MODE = ""
@@ -49,6 +49,6 @@
 fi
 
 if [ "$MODE" ]; then
-	dbus-send --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE
+	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE > /dev/null
 fi
 

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh	2007-08-13 17:56:20 UTC (rev 13171)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh	2007-08-14 08:28:01 UTC (rev 13172)
@@ -14,6 +14,6 @@
 
 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
+dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$PRODUCT_NAME" > /dev/null
+dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetDiscoverableTimeout uint32:0 > /dev/null
+dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:off > /dev/null