[telepathy-salut/master] HT_CONTACT_LIST has been renamed to HT_LIST

[Guillaume Desmottes]

---
 tests/twisted/avahi/test-two-muc-stream-tubes.py   |    8 ++++----
 .../twisted/avahi/test-two-private-stream-tubes.py |    8 ++++----
 tests/twisted/saluttest.py                         |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/twisted/avahi/test-two-muc-stream-tubes.py b/tests/twisted/avahi/test-two-muc-stream-tubes.py
index 0a1f54a..e26be13 100644
--- a/tests/twisted/avahi/test-two-muc-stream-tubes.py
+++ b/tests/twisted/avahi/test-two-muc-stream-tubes.py
@@ -97,17 +97,17 @@ def test(q, bus, conn):
     q.expect('dbus-signal', signal='NewChannel', path=conn2.object_path)
 
     # first connection: get the contact list
-    publish_handle = conn.RequestHandles(HT_CONTACT_LIST, ["publish"])[0]
+    publish_handle = conn.RequestHandles(HT_LIST, ["publish"])[0]
     conn1_publish = conn.RequestChannel(
         "org.freedesktop.Telepathy.Channel.Type.ContactList",
-        HT_CONTACT_LIST, publish_handle, False)
+        HT_LIST, publish_handle, False)
     conn1_publish_proxy = bus.get_object(conn.bus_name, conn1_publish)
 
     # second connection: get the contact list
-    publish_handle = conn2.RequestHandles(HT_CONTACT_LIST, ["publish"])[0]
+    publish_handle = conn2.RequestHandles(HT_LIST, ["publish"])[0]
     conn2_publish = conn2.RequestChannel(
         "org.freedesktop.Telepathy.Channel.Type.ContactList",
-        HT_CONTACT_LIST, publish_handle, False)
+        HT_LIST, publish_handle, False)
     conn2_publish_proxy = bus.get_object(conn2.bus_name, conn2_publish)
 
     # first connection: wait to see contact2
diff --git a/tests/twisted/avahi/test-two-private-stream-tubes.py b/tests/twisted/avahi/test-two-private-stream-tubes.py
index fd1b60a..d119c9e 100644
--- a/tests/twisted/avahi/test-two-private-stream-tubes.py
+++ b/tests/twisted/avahi/test-two-private-stream-tubes.py
@@ -83,15 +83,15 @@ def test(q, bus, conn):
     q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L])
 
     # first connection: get the contact list
-    publish_handle = conn.RequestHandles(HT_CONTACT_LIST, ["publish"])[0]
+    publish_handle = conn.RequestHandles(HT_LIST, ["publish"])[0]
     conn1_publish = conn.RequestChannel(CHANNEL_TYPE_CONTACT_LIST,
-        HT_CONTACT_LIST, publish_handle, False)
+        HT_LIST, publish_handle, False)
     conn1_publish_proxy = bus.get_object(conn.bus_name, conn1_publish)
 
     # second connection: get the contact list
-    publish_handle = conn2.RequestHandles(HT_CONTACT_LIST, ["publish"])[0]
+    publish_handle = conn2.RequestHandles(HT_LIST, ["publish"])[0]
     conn2_publish = conn2.RequestChannel(CHANNEL_TYPE_CONTACT_LIST,
-        HT_CONTACT_LIST, publish_handle, False)
+        HT_LIST, publish_handle, False)
     conn2_publish_proxy = bus.get_object(conn2.bus_name, conn2_publish)
 
     # first connection: wait to see contact2
diff --git a/tests/twisted/saluttest.py b/tests/twisted/saluttest.py
index f7b4386..5d37bc6 100644
--- a/tests/twisted/saluttest.py
+++ b/tests/twisted/saluttest.py
@@ -130,18 +130,18 @@ def wait_for_contact_list(q, conn):
     # publish
     requestotron.EnsureChannel({
         cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
-        cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT_LIST,
+        cs.TARGET_HANDLE_TYPE: cs.HT_LIST,
         cs.TARGET_ID: 'publish'})
     q.expect('dbus-signal', signal='NewChannel')
     # subscribe
     requestotron.EnsureChannel({
         cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
-        cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT_LIST,
+        cs.TARGET_HANDLE_TYPE: cs.HT_LIST,
         cs.TARGET_ID: 'subscribe'})
     q.expect('dbus-signal', signal='NewChannel')
     # known
     requestotron.EnsureChannel({
         cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
-        cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT_LIST,
+        cs.TARGET_HANDLE_TYPE: cs.HT_LIST,
         cs.TARGET_ID: 'known'})
     q.expect('dbus-signal', signal='NewChannel')
-- 
1.5.6.5