aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-01-10 00:14:04 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-10 00:14:04 +0800
commita9ddf2bc00f20ac6fae42479921538950c1a8d07 (patch)
tree62476e2d0218e6bcfe7ae51b7add1a2a87d5bf2f /src
parentf2b92d8dbeae2d666e8a777f38519b524aee78f9 (diff)
downloadgsoc2013-empathy-a9ddf2bc00f20ac6fae42479921538950c1a8d07.tar
gsoc2013-empathy-a9ddf2bc00f20ac6fae42479921538950c1a8d07.tar.gz
gsoc2013-empathy-a9ddf2bc00f20ac6fae42479921538950c1a8d07.tar.bz2
gsoc2013-empathy-a9ddf2bc00f20ac6fae42479921538950c1a8d07.tar.lz
gsoc2013-empathy-a9ddf2bc00f20ac6fae42479921538950c1a8d07.tar.xz
gsoc2013-empathy-a9ddf2bc00f20ac6fae42479921538950c1a8d07.tar.zst
gsoc2013-empathy-a9ddf2bc00f20ac6fae42479921538950c1a8d07.zip
DIspatch streamed media channels
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2163
Diffstat (limited to 'src')
-rw-r--r--src/empathy.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 1c275f11e..baee1be12 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -42,7 +42,7 @@
#include <libempathy/empathy-dispatcher.h>
#include <libempathy/empathy-dispatch-operation.h>
#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-tp-group.h>
+#include <libempathy/empathy-tp-call.h>
#include <libempathy-gtk/empathy-conf.h>
#include <libempathy-gtk/empathy-ui-utils.h>
@@ -105,12 +105,19 @@ dispatch_cb (EmpathyDispatcher *dispatcher,
g_object_unref (tp_chat);
empathy_dispatch_operation_claim (operation);
+ } else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA) {
+ EmpathyTpCall *call;
+
+ call = EMPATHY_TP_CALL (
+ empathy_dispatch_operation_get_channel_wrapper (operation));
+
+ empathy_dispatch_operation_claim (operation);
+
+ empathy_call_window_new (call);
+
+ g_object_unref (call);
+
}
-#if 0
- else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
- empathy_call_window_new (channel);
- }
-#endif
else if (channel_type == EMP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER) {
EmpathyFTManager *ft_manager;
EmpathyTpFile *tp_file;