diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-03-14 12:56:45 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-03-14 13:00:59 +0100 |
| commit | 9415b529a87ed63faa770799655c9506c86ea6b4 (patch) | |
| tree | 5692e79158ac4af9ff356d5b01b4142dd5b08a6b | |
| parent | db4715246a5ccb28dd427f467cfdd4a34b4e65ff (diff) | |
| download | telepathy-glib-9415b529a87ed63faa770799655c9506c86ea6b4.tar.gz | |
call-channel: pass our factory to TpCallStream objects
Partially fix fdo#76168.
| -rw-r--r-- | telepathy-glib/call-content.c | 1 | ||||
| -rw-r--r-- | tests/dbus/call-channel.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c index 071e304e7..c0f98e536 100644 --- a/telepathy-glib/call-content.c +++ b/telepathy-glib/call-content.c @@ -118,6 +118,7 @@ _tp_call_stream_new (TpCallContent *self, "object-path", object_path, "connection", self->priv->connection, "content", self, + "factory", tp_proxy_get_factory (self), NULL); } diff --git a/tests/dbus/call-channel.c b/tests/dbus/call-channel.c index 1269f2bdd..89e1ae59c 100644 --- a/tests/dbus/call-channel.c +++ b/tests/dbus/call-channel.c @@ -577,6 +577,8 @@ test_basics (Test *test, tp_channel_get_target_contact (test->chan)); g_assert_cmpuint (GPOINTER_TO_UINT (v), ==, TP_SENDING_STATE_PENDING_SEND); + g_assert (tp_proxy_get_factory (audio_stream) == + tp_proxy_get_factory (test->call_chan)); g_assert_cmpuint (tp_call_stream_get_local_sending_state (audio_stream), ==, TP_SENDING_STATE_SENDING); @@ -697,6 +699,8 @@ test_basics (Test *test, g_assert_cmpuint (g_hash_table_size (remote_members), ==, 1); v = g_hash_table_lookup (remote_members, tp_channel_get_target_contact (test->chan)); + g_assert (tp_proxy_get_factory (video_stream) == + tp_proxy_get_factory (test->call_chan)); /* After a moment, the video stream becomes connected, and the remote user * accepts our proposed direction change. These might happen in either |