telepathy-idle: stop using GetSelfHandle()

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


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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Sep 20 15:04:13 2013 +0200

stop using GetSelfHandle()

Will be removed in Telepathy 1.0

---

 tests/twisted/channels/join-muc-channel-bouncer.py |    2 +-
 tests/twisted/channels/requests-create.py          |    2 +-
 tests/twisted/channels/requests-muc.py             |    2 +-
 tests/twisted/messages/contactinfo-request.py      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/channels/join-muc-channel-bouncer.py b/tests/twisted/channels/join-muc-channel-bouncer.py
index 99be149..e9b145c 100644
--- a/tests/twisted/channels/join-muc-channel-bouncer.py
+++ b/tests/twisted/channels/join-muc-channel-bouncer.py
@@ -37,7 +37,7 @@ def test(q, bus, conn, stream):
 
     CHANNEL_NAME = "#idletest"
 
-    self_handle = conn.GetSelfHandle()
+    self_handle = conn.Get(CONN, 'SelfHandle', dbus_interface=PROPERTIES_IFACE)
 
     # The bouncer initiates a JOIN.
     path = test_join_bouncer(q, conn, stream, CHANNEL_NAME)
diff --git a/tests/twisted/channels/requests-create.py b/tests/twisted/channels/requests-create.py
index 54f5eb3..66cf480 100644
--- a/tests/twisted/channels/requests-create.py
+++ b/tests/twisted/channels/requests-create.py
@@ -53,7 +53,7 @@ def test(q, bus, conn, stream):
     assert emitted_props[cs.TARGET_HANDLE] == foo_handle
     assert emitted_props[cs.TARGET_ID] == nick
     assert emitted_props[cs.REQUESTED]
-    assert emitted_props[cs.INITIATOR_HANDLE] == conn.GetSelfHandle()
+    assert emitted_props[cs.INITIATOR_HANDLE] == props['SelfHandle']
     assert emitted_props[cs.INITIATOR_ID] == stream.nick
 
     assert len(new_sig.args) == 1
diff --git a/tests/twisted/channels/requests-muc.py b/tests/twisted/channels/requests-muc.py
index aa11d1b..299d5c7 100644
--- a/tests/twisted/channels/requests-muc.py
+++ b/tests/twisted/channels/requests-muc.py
@@ -55,7 +55,7 @@ def test(q, bus, conn, stream, use_room=False):
     q.expect('dbus-signal', signal='SelfHandleChanged')
     q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
 
-    self_handle = conn.GetSelfHandle()
+    self_handle = conn.Get(cs.CONN, 'SelfHandle', dbus_interface=cs.PROPERTIES_IFACE)
 
     request = build_request(conn, '#idletest', use_room)
     call_async(q, conn.Requests, 'CreateChannel', request)
diff --git a/tests/twisted/messages/contactinfo-request.py b/tests/twisted/messages/contactinfo-request.py
index bba13aa..44464ca 100644
--- a/tests/twisted/messages/contactinfo-request.py
+++ b/tests/twisted/messages/contactinfo-request.py
@@ -41,7 +41,7 @@ def test(q, bus, conn, stream):
         args=[1L])
     q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
 
-    self_handle = conn.GetSelfHandle()
+    self_handle = conn.Get(CONN, 'SelfHandle', dbus_interface=PROPERTIES_IFACE)
 
     for name in CHANNEL_NAMES:
         call_async(q, conn.Requests, 'CreateChannel',



More information about the telepathy-commits mailing list