telepathy-idle: stop using RequestHandles()

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Mon Sep 23 04:53:09 PDT 2013


Module: telepathy-idle
Branch: master
Commit: 0a3f85fad87ccbec4d21af1b3b15491449554ea8
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=0a3f85fad87ccbec4d21af1b3b15491449554ea8

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon Sep 23 12:35:54 2013 +0200

stop using RequestHandles()

It will be deprecated in Telepathy 1.0

---

 tests/twisted/channels/muc-channel-topic.py |    2 +-
 tests/twisted/channels/requests-create.py   |    4 +---
 tests/twisted/contacts.py                   |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/channels/muc-channel-topic.py b/tests/twisted/channels/muc-channel-topic.py
index c460ece..10ddf47 100644
--- a/tests/twisted/channels/muc-channel-topic.py
+++ b/tests/twisted/channels/muc-channel-topic.py
@@ -68,7 +68,7 @@ def test(q, bus, conn, stream):
 
     q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
 
-    alice_handle, bob_handle = conn.RequestHandles(HT_CONTACT, ['alice', 'bob'])
+    alice_handle, bob_handle = conn.get_contact_handles_sync(['alice', 'bob'])
 
     call_async(q, conn.Requests, 'CreateChannel',
             { CHANNEL_TYPE: CHANNEL_TYPE_TEXT,
diff --git a/tests/twisted/channels/requests-create.py b/tests/twisted/channels/requests-create.py
index 66cf480..957560e 100644
--- a/tests/twisted/channels/requests-create.py
+++ b/tests/twisted/channels/requests-create.py
@@ -20,9 +20,7 @@ def test(q, bus, conn, stream):
     assertContains(cs.CONN_IFACE_REQUESTS, props['Interfaces'])
 
     nick = 'foo'
-    call_async(q, conn, 'RequestHandles', cs.HT_CONTACT, [nick])
-    event = q.expect('dbus-return', method='RequestHandles')
-    foo_handle = event.value[0][0]
+    foo_handle = conn.get_contact_handle_sync(nick)
 
     properties = conn.GetAll(cs.CONN_IFACE_REQUESTS,
             dbus_interface=cs.PROPERTIES_IFACE)
diff --git a/tests/twisted/contacts.py b/tests/twisted/contacts.py
index 1e83f35..8df602e 100644
--- a/tests/twisted/contacts.py
+++ b/tests/twisted/contacts.py
@@ -18,8 +18,7 @@ def test(q, bus, conn, stream):
     assertContains(cs.CONN_IFACE_ALIASING, attr_ifaces)
     assertContains(cs.CONN_IFACE_CONTACT_INFO, attr_ifaces)
 
-    brillana, miriam = conn.RequestHandles(cs.HT_CONTACT,
-        ["brillana", "miriam"])
+    brillana, miriam = conn.get_contact_handles_sync(["brillana", "miriam"])
 
     # First up, check that contact-id is always present
     attrs = conn.Contacts.GetContactAttributes([brillana], [], True)



More information about the telepathy-commits mailing list