diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-11-10 03:25:17 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-11-11 22:01:08 +0800 |
| commit | 92e94e644937590a6832f1321b1ce285cae38f86 (patch) | |
| tree | fc3ddafba8a743dbf4778025dda742a355a1f1b0 /src/empathy-call-handler.c | |
| parent | 8b9ee2a0f048ce6263efe0d0660ed04a53861adf (diff) | |
| download | gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.gz gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.bz2 gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.lz gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.xz gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.tar.zst gsoc2013-empathy-92e94e644937590a6832f1321b1ce285cae38f86.zip | |
Don't turn on echo cancellation on the sink if it's for raw conferences
https://bugzilla.gnome.org/show_bug.cgi?id=663842
Diffstat (limited to 'src/empathy-call-handler.c')
| -rw-r--r-- | src/empathy-call-handler.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index 0477cd7c0..4014ad6c6 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -479,7 +479,7 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_BOOLEAN, - 2, GST_TYPE_PAD, G_TYPE_UINT); + 2, TF_TYPE_CONTENT, GST_TYPE_PAD); signals[CONTENT_ADDED] = g_signal_new ("content-added", G_TYPE_FROM_CLASS (klass), @@ -763,13 +763,10 @@ on_tf_content_src_pad_added_cb (TfContent *content, FsCodec *codec, EmpathyCallHandler *handler) { - guint media_type; gboolean retval; - g_object_get (content, "media-type", &media_type, NULL); - g_signal_emit (G_OBJECT (handler), signals[SRC_PAD_ADDED], 0, - pad, media_type, &retval); + content, pad, &retval); if (!retval) g_idle_add (src_pad_added_error_idle, g_object_ref (content)); |