[Telepathy-commits] [telepathy-doc/master] Only request available interfaces

[Davyd Madeley]

---
 docs/examples/pygtk_chat_client/example.py |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/docs/examples/pygtk_chat_client/example.py b/docs/examples/pygtk_chat_client/example.py
index 7ac6e6e..be98ddb 100755
--- a/docs/examples/pygtk_chat_client/example.py
+++ b/docs/examples/pygtk_chat_client/example.py
@@ -125,16 +125,20 @@ class ContactList(Channel):
             print 'Channel does not implement Group... strange'
 
     def _members_cb(self, handles):
+        # these are the interfaces we're seeking
+        interfaces = [
+                 CONNECTION_INTERFACE_ALIASING,
+                 CONNECTION_INTERFACE_SIMPLE_PRESENCE,
+            ]
+
+        # work out what interfaces are available
+        interfaces = list (set(interfaces) & set(self.conn.interfaces))
+        interfaces += [ CONNECTION ]
+
         # look them up via the contacts interface
         if CONNECTION_INTERFACE_CONTACTS in self.conn.interfaces:
             self.conn[CONNECTION_INTERFACE_CONTACTS].GetContactAttributes(
-                handles,
-                [
-                 CONNECTION,
-                 CONNECTION_INTERFACE_ALIASING,
-                 CONNECTION_INTERFACE_SIMPLE_PRESENCE,
-                ],
-                False,
+                handles, interfaces, False,
                 reply_handler = self._attributes_cb,
                 error_handler = self.sm.error)
 
-- 
1.5.6.5