[Telepathy-commits] [telepathy-python/master] Don't suck at releasing handles

Olli Salli olli.salli at collabora.co.uk
Thu Dec 18 07:54:28 PST 2008


---
 src/server/conn.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/conn.py b/src/server/conn.py
index 736283d..0d718a9 100644
--- a/src/server/conn.py
+++ b/src/server/conn.py
@@ -239,14 +239,14 @@ class Connection(_Connection):
             self.check_handle(handle_type, handle)
             hand = self._handles[handle_type, handle]
             if sender in self._client_handles:
-                if hand not in self._client_handles[sender]:
-                    raise NotAvailable('client is not holding handle %s' % handle)
+                if (handle_type, hand) not in self._client_handles[sender]:
+                    raise NotAvailable('client is not holding handle %s of type %s' % (handle, handle_type))
             else:
                 raise NotAvailable('client does not hold any handles')
 
         for handle in handles:
             hand = self._handles[handle_type, handle]
-            self._client_handles[sender].remove(hand)
+            self._client_handles[sender].remove((handle_type, hand))
 
     @dbus.service.method(CONN_INTERFACE, in_signature='', out_signature='u')
     def GetSelfHandle(self):
-- 
1.5.6.5




More information about the Telepathy-commits mailing list