[Pkg-telepathy-commits] [telepathy-glib] 100/111: call-channel: pass our factory to TpCallContent objects

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib.

commit db4715246a5ccb28dd427f467cfdd4a34b4e65ff
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Mar 14 12:56:45 2014 +0100

    call-channel: pass our factory to TpCallContent objects
    
    Partially fix fdo#76168.
---
 telepathy-glib/call-channel.c | 1 +
 tests/dbus/call-channel.c     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
index 59dd90b..8ed7632 100644
--- a/telepathy-glib/call-channel.c
+++ b/telepathy-glib/call-channel.c
@@ -132,6 +132,7 @@ _tp_call_content_new (TpCallChannel *self,
       "object-path", object_path,
       "connection", tp_channel_get_connection ((TpChannel *) self),
       "channel", self,
+      "factory", tp_proxy_get_factory (self),
       NULL);
 }
 
diff --git a/tests/dbus/call-channel.c b/tests/dbus/call-channel.c
index 12bafce..1269f2b 100644
--- a/tests/dbus/call-channel.c
+++ b/tests/dbus/call-channel.c
@@ -658,7 +658,9 @@ test_basics (Test *test,
   g_main_loop_run (test->mainloop);
   g_assert_no_error (test->error);
 
-  g_assert (test->added_content != NULL);
+  g_assert (TP_IS_CALL_CONTENT (test->added_content));
+  g_assert (tp_proxy_get_factory (test->added_content) ==
+      tp_proxy_get_factory (test->call_chan));
   video_content = test->added_content;
   tp_tests_proxy_run_until_prepared (video_content, NULL);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib.git