MembersChangedDetailed has been replaced by MembersChanged

11 files changed, 23 insertions, 23 deletions

diff --git a/tests/twisted/muc/kicked.py b/tests/twisted/muc/kicked.py
index 307b96f25..45694e36f 100644
--- a/tests/twisted/muc/kicked.py
+++ b/tests/twisted/muc/kicked.py
@@ -35,7 +35,7 @@ def test(q, bus, conn, stream):
           )
         ))
 
-    mcd_event = q.expect('dbus-signal', signal='MembersChangedDetailed')
+    mcd_event = q.expect('dbus-signal', signal='MembersChanged')
     added, removed, local_pending, remote_pending, details = mcd_event.args
     assertEquals([], added)
     assertEquals([muc_self_handle], removed)
diff --git a/tests/twisted/muc/name-conflict.py b/tests/twisted/muc/name-conflict.py
index 2aee8d2f3..3d7c226e4 100644
--- a/tests/twisted/muc/name-conflict.py
+++ b/tests/twisted/muc/name-conflict.py
@@ -182,14 +182,14 @@ def test_gtalk_weirdness(q, bus, conn, stream, room_jid):
     # try to join the MUC, because until we do so, Gabble doesn't know that
     # room_jid is a MUC, and so considers these three JIDs to be different
     # resources of the same contact. There is no race between this method
-    # returning and MembersChangedDetailed firing, because libdbus reorders
+    # returning and MembersChanged firing, because libdbus reorders
     # messages when you make blocking calls.
     handle, handle_, handle__, foobar_handle = conn.get_contact_handles_sync(
         jids + ['%s/foobar_gmail.com' % room_jid])
 
-    q.expect('dbus-signal', signal='MembersChangedDetailed',
+    q.expect('dbus-signal', signal='MembersChanged',
         predicate=lambda e: e.args[0:4] == [[foobar_handle], [], [], []])
-    q.expect('dbus-signal', signal='MembersChangedDetailed',
+    q.expect('dbus-signal', signal='MembersChanged',
         predicate=lambda e: e.args[0:4] == [[handle], [], [], []])
 
     group_props = text_chan.Properties.GetAll(cs.CHANNEL_IFACE_GROUP)
diff --git a/tests/twisted/muc/test-ensure.py b/tests/twisted/muc/test-ensure.py
index 858385256..bfdd3a301 100644
--- a/tests/twisted/muc/test-ensure.py
+++ b/tests/twisted/muc/test-ensure.py
@@ -30,7 +30,7 @@ def test_create_ensure(q, conn, bus, stream, room_jid):
            })
 
     mc, _ = q.expect_many(
-        EventPattern('dbus-signal', signal='MembersChangedDetailed'),
+        EventPattern('dbus-signal', signal='MembersChanged'),
         EventPattern('stream-presence', to=('%s/test' % room_jid)))
     added, removed, local_pending, remote_pending, details = mc.args
 
@@ -45,7 +45,7 @@ def test_create_ensure(q, conn, bus, stream, room_jid):
     # Send presence for own membership of room.
     stream.send(make_muc_presence('none', 'participant', room_jid, 'test'))
 
-    mc = q.expect('dbus-signal', signal='MembersChangedDetailed')
+    mc = q.expect('dbus-signal', signal='MembersChanged')
     added, removed, local_pending, remote_pending, details = mc.args
 
     assert len(added) == 2, mc.args
@@ -94,7 +94,7 @@ def test_ensure_ensure(q, conn, bus, stream, room_jid):
            })
 
     mc, _ = q.expect_many(
-        EventPattern('dbus-signal', signal='MembersChangedDetailed'),
+        EventPattern('dbus-signal', signal='MembersChanged'),
         EventPattern('stream-presence', to=('%s/test' % room_jid)))
     added, removed, local_pending, remote_pending, details = mc.args
 
@@ -109,7 +109,7 @@ def test_ensure_ensure(q, conn, bus, stream, room_jid):
     # Send presence for own membership of room.
     stream.send(make_muc_presence('none', 'participant', room_jid, 'test'))
 
-    mc = q.expect('dbus-signal', signal='MembersChangedDetailed')
+    mc = q.expect('dbus-signal', signal='MembersChanged')
     added, removed, local_pending, remote_pending, details = mc.args
 
     assert len(added) == 2, mc.args
diff --git a/tests/twisted/muc/test-muc-alias.py b/tests/twisted/muc/test-muc-alias.py
index 7fedee3a3..a9675bb7b 100644
--- a/tests/twisted/muc/test-muc-alias.py
+++ b/tests/twisted/muc/test-muc-alias.py
@@ -29,7 +29,7 @@ def test(q, bus, conn, stream):
 
     gfc, _, _ = q.expect_many(
         EventPattern('dbus-signal', signal='GroupFlagsChanged'),
-        EventPattern('dbus-signal', signal='MembersChangedDetailed',
+        EventPattern('dbus-signal', signal='MembersChanged',
             predicate=lambda e:
                 e.args[0] == [] and         # added
                 e.args[1] == [] and         # removed
@@ -47,7 +47,7 @@ def test(q, bus, conn, stream):
     # Send presence for own membership of room.
     stream.send(make_muc_presence('none', 'participant', room_jid, 'lala'))
 
-    event = q.expect('dbus-signal', signal='MembersChangedDetailed',
+    event = q.expect('dbus-signal', signal='MembersChanged',
             predicate=lambda e:
                 len(e.args[0]) == 2 and     # added
                 e.args[1] == [] and         # removed
diff --git a/tests/twisted/muc/test-muc-invitation.py b/tests/twisted/muc/test-muc-invitation.py
index 68b03d8b9..ea3965a71 100644
--- a/tests/twisted/muc/test-muc-invitation.py
+++ b/tests/twisted/muc/test-muc-invitation.py
@@ -62,7 +62,7 @@ def test(q, bus, conn, stream):
 
     event, event2, _ = q.expect_many(
             EventPattern('stream-presence', to='chat@conf.localhost/test'),
-            EventPattern('dbus-signal', signal='MembersChangedDetailed'),
+            EventPattern('dbus-signal', signal='MembersChanged'),
             EventPattern('dbus-return', method='AddMembers')
             )
 
@@ -90,7 +90,7 @@ def test(q, bus, conn, stream):
     # Send presence for own membership of room.
     stream.send(make_muc_presence('owner', 'moderator', 'chat@conf.localhost', 'test'))
 
-    event = q.expect('dbus-signal', signal='MembersChangedDetailed')
+    event = q.expect('dbus-signal', signal='MembersChanged')
 
     room_bob_handle = conn.get_contact_handle_sync('chat@conf.localhost/bob')
 
diff --git a/tests/twisted/muc/test-muc-ownership.py b/tests/twisted/muc/test-muc-ownership.py
index 9ac2c84cd..24ab72974 100644
--- a/tests/twisted/muc/test-muc-ownership.py
+++ b/tests/twisted/muc/test-muc-ownership.py
@@ -27,7 +27,7 @@ def test(q, bus, conn, stream):
         # Initial group flags
         EventPattern('dbus-signal', signal='GroupFlagsChanged',
             predicate=lambda e: e.args[0] != 0),
-        EventPattern('dbus-signal', signal='MembersChangedDetailed',
+        EventPattern('dbus-signal', signal='MembersChanged',
             predicate=lambda e: e.args[3] == [2]),
         # Removing CAN_ADD
         EventPattern('dbus-signal', signal='GroupFlagsChanged',
@@ -60,7 +60,7 @@ def test(q, bus, conn, stream):
     event = q.expect('dbus-signal', signal='HandleOwnersChanged')
     owners = event.args[0]
 
-    event = q.expect('dbus-signal', signal='MembersChangedDetailed')
+    event = q.expect('dbus-signal', signal='MembersChanged')
     added = event.args[0]
 
     [test, bob, brian, che, che_owner, chris, chris_owner] = \
diff --git a/tests/twisted/roster/test-roster-subscribe.py b/tests/twisted/roster/test-roster-subscribe.py
index 8b2a893a6..d90ad05a0 100644
--- a/tests/twisted/roster/test-roster-subscribe.py
+++ b/tests/twisted/roster/test-roster-subscribe.py
@@ -82,7 +82,7 @@ def test(q, bus, conn, stream, remove=False, remote='accept'):
         stream.send(presence)
 
         q.expect_many(
-                EventPattern('dbus-signal', signal='MembersChangedDetailed',
+                EventPattern('dbus-signal', signal='MembersChanged',
                     predicate=lambda e: e.args[0] == [] and e.args[1] == [bob] and
                         e.args[2] == [] and e.args[3] == [] and
                         e.args[4]['change-reason'] == cs.GC_REASON_PERMISSION_DENIED),
@@ -104,7 +104,7 @@ def test(q, bus, conn, stream, remove=False, remote='accept'):
         stream.send(presence)
 
         q.expect_many(
-                EventPattern('dbus-signal', signal='MembersChangedDetailed',
+                EventPattern('dbus-signal', signal='MembersChanged',
                     predicate=lambda e: e.args[0] == [bob] and e.args[1] == [] and
                         e.args[2] == [] and e.args[3] == []),
                 EventPattern('stream-presence'),
@@ -145,7 +145,7 @@ def test(q, bus, conn, stream, remove=False, remote='accept'):
             stream.send(presence)
 
             q.expect_many(
-                    EventPattern('dbus-signal', signal='MembersChangedDetailed',
+                    EventPattern('dbus-signal', signal='MembersChanged',
                         predicate=lambda e: e.args[0] == [] and e.args[1] == [bob] and
                             e.args[2] == [] and e.args[3] == [] and
                             e.args[4]['change-reason'] == cs.GC_REASON_PERMISSION_DENIED),
diff --git a/tests/twisted/roster/test-save-alias-to-roster.py b/tests/twisted/roster/test-save-alias-to-roster.py
index 54477bf5e..b56981321 100644
--- a/tests/twisted/roster/test-save-alias-to-roster.py
+++ b/tests/twisted/roster/test-save-alias-to-roster.py
@@ -88,7 +88,7 @@ def test(q, bus, conn, stream):
     # I don't really have very strong opinions on whether Gabble should be
     # signalling that this contact's alias has *changed* per se, so am not
     # explicitly expecting that.
-    q.expect('dbus-signal', signal='MembersChangedDetailed')
+    q.expect('dbus-signal', signal='MembersChanged')
 
     # But if we ask for it, Gabble should probably send a PEP query.
     h2asv = conn.Contacts.GetContactAttributes([handle], [cs.CONN_IFACE_ALIASING])
diff --git a/tests/twisted/tubes/accept-muc-stream-tube.py b/tests/twisted/tubes/accept-muc-stream-tube.py
index a209ab08e..16f2d6254 100644
--- a/tests/twisted/tubes/accept-muc-stream-tube.py
+++ b/tests/twisted/tubes/accept-muc-stream-tube.py
@@ -47,7 +47,7 @@ def test(q, bus, conn, stream, bytestream_cls,
             cs.TARGET_ID: 'chat@conf.localhost'})
 
     q.expect_many(
-        EventPattern('dbus-signal', signal='MembersChangedDetailed',
+        EventPattern('dbus-signal', signal='MembersChanged',
             predicate=lambda e:
                 e.args[0] == [] and         # added
                 e.args[1] == [] and         # removed
@@ -64,7 +64,7 @@ def test(q, bus, conn, stream, bytestream_cls,
     # Send presence for own membership of room.
     stream.send(make_muc_presence('none', 'participant', 'chat@conf.localhost', 'test'))
 
-    event = q.expect('dbus-signal', signal='MembersChangedDetailed',
+    event = q.expect('dbus-signal', signal='MembersChanged',
             predicate=lambda e:
                 len(e.args[0]) == 2 and     # added
                 e.args[1] == [] and         # removed
diff --git a/tests/twisted/tubes/close-muc-with-closed-tube.py b/tests/twisted/tubes/close-muc-with-closed-tube.py
index c5a7a5da4..3f28d2aae 100644
--- a/tests/twisted/tubes/close-muc-with-closed-tube.py
+++ b/tests/twisted/tubes/close-muc-with-closed-tube.py
@@ -28,7 +28,7 @@ def test(q, bus, conn, stream):
             cs.TARGET_ID: 'chat@conf.localhost'})
 
     q.expect_many(
-        EventPattern('dbus-signal', signal='MembersChangedDetailed',
+        EventPattern('dbus-signal', signal='MembersChanged',
             predicate=lambda e:
                 e.args[0] == [] and         # added
                 e.args[1] == [] and         # removed
@@ -45,7 +45,7 @@ def test(q, bus, conn, stream):
     # Send presence for own membership of room.
     stream.send(make_muc_presence('none', 'participant', 'chat@conf.localhost', 'test'))
 
-    event = q.expect('dbus-signal', signal='MembersChangedDetailed',
+    event = q.expect('dbus-signal', signal='MembersChanged',
             predicate=lambda e:
                 len(e.args[0]) == 2 and     # added
                 e.args[1] == [] and         # removed
diff --git a/tests/twisted/tubes/test-get-available-tubes.py b/tests/twisted/tubes/test-get-available-tubes.py
index a5508486d..74660d730 100644
--- a/tests/twisted/tubes/test-get-available-tubes.py
+++ b/tests/twisted/tubes/test-get-available-tubes.py
@@ -40,7 +40,7 @@ def test(q, bus, conn, stream):
     stream.send(make_muc_presence('owner', 'moderator', 'chat@conf.localhost', 'test'))
 
     _, event = q.expect_many(
-            EventPattern('dbus-signal', signal='MembersChangedDetailed',
+            EventPattern('dbus-signal', signal='MembersChanged',
                 predicate=lambda e:
                     len(e.args[0]) == 2 and     # added
                     e.args[1] == [] and         # removed