Increased TimedDisconnect to 10 seconds

[theonering] / src / tp / conn.py

diff --git a/src/tp/conn.py b/src/tp/conn.py
index 93095c7..57ddbbd 100644 (file)
--- a/src/tp/conn.py
+++ b/src/tp/conn.py
@@ -129,7 +129,7 @@ class Connection(_Connection, DBusProperties):
                 if not isinstance(value, (int, long)):
                     raise InvalidArgument('incorrect type to %s parameter, got %s, expected an int' % (parm, type(value)))
             elif sig == 'b':
-                if not isinstance(value, bool):
+                if not isinstance(value, (bool, dbus.types.Boolean)):
                     raise InvalidArgument('incorrect type to %s parameter, got %s, expected an boolean' % (parm, type(value)))
             else:
                 raise TypeError('unknown type signature %s in protocol parameters' % type)
@@ -169,6 +169,9 @@ class Connection(_Connection, DBusProperties):
             self._client_handles[sender] = set([(handle.get_type(), handle)])
 
     def get_handle_by_id(self, handle_type, handle_id):
+        # Strip off dbus stuff so we can be consistent
+        handle_type, handle_id = int(handle_type), int(handle_id)
+
         self.check_handle(handle_type, handle_id)
         return self._handles[handle_type, handle_id]
 
@@ -489,8 +492,10 @@ class ConnectionInterfaceRequests(
         altered_properties = props.copy()
 
         if target_handle_type != HANDLE_TYPE_NONE:
-            if target_handle == None:
-                target_handle = self.get_handle_by_name(target_handle_type, target_id).get_id()
+            if target_handle is None:
+                handle = self.get_handle_by_name(target_handle_type, target_id)
+                self.add_client_handle(handle, None)
+                target_handle = handle.get_id()
                 altered_properties[CHANNEL_INTERFACE + '.TargetHandle'] = \
                     target_handle
             else:
@@ -514,7 +519,7 @@ class ConnectionInterfaceRequests(
         self._validate_handle(request)
         props = self._alter_properties(request)
 
-        channel = self._channel_manager.channel_for_props(props, signal=False)
+        channel = self._channel_manager.create_channel_for_props(props, signal=False)
 
         # Remove mutable properties
         todel = []