[telepathy-gabble/master] Set actor and reason when calls start/are accepted
Will Thompson
will.thompson at collabora.co.uk
Thu Mar 19 09:18:22 PDT 2009
---
src/media-channel.c | 14 ++++++++------
tests/twisted/jingle/accept-extra-stream.py | 4 +++-
tests/twisted/jingle/google-relay.py | 4 +++-
tests/twisted/jingle/test-content-complex.py | 3 ++-
tests/twisted/jingle/test-description-info.py | 3 ++-
tests/twisted/jingle/test-dialects-incoming.py | 2 +-
tests/twisted/jingle/test-incoming-call.py | 3 ++-
tests/twisted/jingle/test-outgoing-call.py | 3 ++-
8 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/media-channel.c b/src/media-channel.c
index 783889a..36a2bd1 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -1936,7 +1936,8 @@ _gabble_media_channel_add_member (GObject *obj,
set = tp_intset_new ();
tp_intset_add (set, handle);
- tp_group_mixin_change_members (obj, "", NULL, NULL, NULL, set, 0, 0);
+ tp_group_mixin_change_members (obj, "", NULL, NULL, NULL, set,
+ mixin->self_handle, TP_CHANNEL_GROUP_CHANGE_REASON_INVITED);
tp_intset_destroy (set);
@@ -1964,8 +1965,8 @@ _gabble_media_channel_add_member (GObject *obj,
set = tp_intset_new ();
tp_intset_add (set, handle);
- tp_group_mixin_change_members (obj,
- "", set, NULL, NULL, NULL, 0, 0);
+ tp_group_mixin_change_members (obj, "", set, NULL, NULL, NULL,
+ handle, TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
tp_intset_destroy (set);
@@ -2136,8 +2137,8 @@ session_state_changed_cb (GabbleJingleSession *session,
/* The first time we send anything to the other user, they materialise
* in remote-pending if necessary */
- tp_group_mixin_change_members ((GObject *) channel,
- "", NULL, NULL, NULL, set, 0, 0);
+ tp_group_mixin_change_members ((GObject *) channel, "", NULL, NULL, NULL,
+ set, mixin->self_handle, TP_CHANNEL_GROUP_CHANGE_REASON_INVITED);
tp_group_mixin_change_flags ((GObject *) channel,
TP_CHANNEL_GROUP_FLAG_CAN_REMOVE | TP_CHANNEL_GROUP_FLAG_CAN_RESCIND,
@@ -2152,7 +2153,8 @@ session_state_changed_cb (GabbleJingleSession *session,
/* add the peer to the member list */
tp_group_mixin_change_members ((GObject *) channel,
- "", set, NULL, NULL, NULL, 0, 0);
+ "", set, NULL, NULL, NULL, peer,
+ TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
/* update flags accordingly -- allow removal, deny adding and
* rescinding */
diff --git a/tests/twisted/jingle/accept-extra-stream.py b/tests/twisted/jingle/accept-extra-stream.py
index 3b7209e..4368fa9 100644
--- a/tests/twisted/jingle/accept-extra-stream.py
+++ b/tests/twisted/jingle/accept-extra-stream.py
@@ -88,7 +88,9 @@ def test(q, bus, conn, stream):
# local send is now sending.
memb, acc, _, _, _, = q.expect_many(
EventPattern('dbus-signal', signal='MembersChanged',
- args=[u'', [self_handle], [], [], [], 0, 0]),
+ args=[u'', [self_handle], [], [], [],
+ self_handle,
+ cs.GC_REASON_NONE]),
EventPattern('stream-iq',
predicate=lambda e: (e.query.name == 'jingle' and
e.query['action'] == 'session-accept')),
diff --git a/tests/twisted/jingle/google-relay.py b/tests/twisted/jingle/google-relay.py
index e746eec..233d7d9 100644
--- a/tests/twisted/jingle/google-relay.py
+++ b/tests/twisted/jingle/google-relay.py
@@ -293,7 +293,9 @@ def test(q, bus, conn, stream, incoming=True, too_slow=False):
q.expect_many(
EventPattern('stream-iq', iq_type='result'),
- EventPattern('dbus-signal', signal='MembersChanged'),
+ EventPattern('dbus-signal', signal='MembersChanged',
+ args=["", [remote_handle], [], [], [], remote_handle,
+ cs.GC_REASON_NONE])
)
media_chan.RemoveMembers([dbus.UInt32(1)], '')
diff --git a/tests/twisted/jingle/test-content-complex.py b/tests/twisted/jingle/test-content-complex.py
index 3230ad1..31363a7 100644
--- a/tests/twisted/jingle/test-content-complex.py
+++ b/tests/twisted/jingle/test-content-complex.py
@@ -79,7 +79,8 @@ def worker(jp, q, bus, conn, stream):
# We are now in members too
e = q.expect('dbus-signal', signal='MembersChanged',
- args=[u'', [self_handle], [], [], [], 0, 0])
+ args=[u'', [self_handle], [], [], [], self_handle,
+ cs.GC_REASON_NONE])
# we are now both in members
members = media_chan.GetMembers()
diff --git a/tests/twisted/jingle/test-description-info.py b/tests/twisted/jingle/test-description-info.py
index 6be8a49..bbc73fe 100644
--- a/tests/twisted/jingle/test-description-info.py
+++ b/tests/twisted/jingle/test-description-info.py
@@ -87,7 +87,8 @@ def test(q, bus, conn, stream):
# We are now in members too
e = q.expect('dbus-signal', signal='MembersChanged',
- args=[u'', [1L], [], [], [], 0, 0])
+ args=[u'', [self_handle], [], [], [], self_handle,
+ cs.GC_REASON_NONE])
# we are now both in members
members = media_chan.GetMembers()
diff --git a/tests/twisted/jingle/test-dialects-incoming.py b/tests/twisted/jingle/test-dialects-incoming.py
index 1e5f556..e2ec39b 100644
--- a/tests/twisted/jingle/test-dialects-incoming.py
+++ b/tests/twisted/jingle/test-dialects-incoming.py
@@ -66,7 +66,7 @@ def worker(jp, q, bus, conn, stream):
# We are now in members too
e = q.expect_racy('dbus-signal', signal='MembersChanged',
- args=[u'', [self_handle], [], [], [], 0, 0])
+ args=[u'', [self_handle], [], [], [], self_handle, 0])
# we are now both in members
members = media_chan.GetMembers()
diff --git a/tests/twisted/jingle/test-incoming-call.py b/tests/twisted/jingle/test-incoming-call.py
index 9788f8c..89f0619 100644
--- a/tests/twisted/jingle/test-incoming-call.py
+++ b/tests/twisted/jingle/test-incoming-call.py
@@ -153,7 +153,8 @@ def test(q, bus, conn, stream):
# local send is now sending.
memb, acc, _, _, _ = q.expect_many(
EventPattern('dbus-signal', signal='MembersChanged',
- args=[u'', [self_handle], [], [], [], 0, 0]),
+ args=[u'', [self_handle], [], [], [], self_handle,
+ cs.GC_REASON_NONE]),
EventPattern('stream-iq',
predicate=lambda e: (e.query.name == 'jingle' and
e.query['action'] == 'session-accept')),
diff --git a/tests/twisted/jingle/test-outgoing-call.py b/tests/twisted/jingle/test-outgoing-call.py
index 18dd7f2..b0da1ee 100644
--- a/tests/twisted/jingle/test-outgoing-call.py
+++ b/tests/twisted/jingle/test-outgoing-call.py
@@ -180,7 +180,8 @@ def test(q, bus, conn, stream):
q.expect('stream-iq', iq_type='result')
# Call accepted
- q.expect('dbus-signal', signal='MembersChanged')
+ q.expect('dbus-signal', signal='MembersChanged',
+ args=['', [handle], [], [], [], handle, cs.GC_REASON_NONE])
# Time passes ... afterwards we close the chan
--
1.5.6.5
More information about the telepathy-commits
mailing list