Attachment 95800 Details for Bug 76168 – call-channel: pass our factory to TpCallStream objects

[patch] call-channel: pass our factory to TpCallStream objects

0002-call-channel-pass-our-factory-to-TpCallStream-object.patch (text/plain), 1.79 KB, created by Guillaume Desmottes on 2014-03-14 12:02:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-03-14 12:02:00 UTC

Size: 1.79 KB

patch

obsolete

>From 9415b529a87ed63faa770799655c9506c86ea6b4 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Fri, 14 Mar 2014 12:56:45 +0100
>Subject: [PATCH 2/2] call-channel: pass our factory to TpCallStream objects
>
>Partially fix fdo#76168.
>---
> telepathy-glib/call-content.c | 1 +
> tests/dbus/call-channel.c     | 4 ++++
> 2 files changed, 5 insertions(+)
>
>diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
>index 071e304..c0f98e5 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 1269f2b..89e1ae5 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
>-- 
>1.8.5.3
>

Actions: View | Splinter Review

Attachments on bug 76168: 95799 | 95800

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.