[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.9.5.9+git20110512-1-44-g2b0bd1a

[Felix Huber]

The following commit has been merged in the debian branch:
commit b1cffda191650c475e401823a3b3cdcbb8d1ec16
Author: Felix Huber <felix.huber at schyf.de>
Date:   Wed Jan 4 23:01:49 2012 +0100

    ophoned: improve BT connect responsiveness

diff --git a/framework/subsystems/ophoned/headset.py b/framework/subsystems/ophoned/headset.py
index c59173e..a92dff8 100644
--- a/framework/subsystems/ophoned/headset.py
+++ b/framework/subsystems/ophoned/headset.py
@@ -100,22 +100,29 @@ class HeadsetManager( object ):
             bluez_device_proxy,
             "org.bluez.Headset",
         )
-        try:
-            self.bluez_device_headset.Connect()
-        except dbus.exceptions.DBusException, e:
-            if e.get_dbus_name() == "org.bluez.Error.AlreadyConnected":
-                pass
-            else:
-                raise
+        self.bluez_device_headset.Connect(
+            reply_handler=self.cbHeadsetConnetReply,
+            error_handler=self.cbHeadsetConnectError
+        )
+
+    def cbHeadsetConnectError( self, e ):
+        if e.get_dbus_name() == "org.bluez.Error.AlreadyConnected":
+            self.cbHeadsetConnetReply()
+        else:
+            logger.info( "BT connect error" )
+            raise
+
+    def cbHeadsetConnetReply( self ):
+        logger.info( "BT connect ok" )
         if self._onAnswerRequested:
             self._matchAnswerRequested = self.bluez_device_headset.connect_to_signal(
                 'AnswerRequested', self._onAnswerRequested
             )
         self._matchDisconnected = self.bluez_device_headset.connect_to_signal(
                 'Disconnected', self._onDisconnected
-        ) 
-        self.connected = True                                                                                               
-        if self._onConnectionStatus:                                                                                        
+        )
+        self.connected = True
+        if self._onConnectionStatus:
             self._onConnectionStatus( self.connected )
 
     def _startBT( self ):

-- 
FSO frameworkd Debian packaging