aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-31 18:11:42 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-01 16:15:39 +0800
commitfeab20693e67e58701010c2a4613d8345d7fedcf (patch)
tree334c3d691acc1dc0544ef113310132d10d022260
parent961ccc0473138e4dd195b7af6e80d0a43ae2463f (diff)
downloadgsoc2013-empathy-feab20693e67e58701010c2a4613d8345d7fedcf.tar
gsoc2013-empathy-feab20693e67e58701010c2a4613d8345d7fedcf.tar.gz
gsoc2013-empathy-feab20693e67e58701010c2a4613d8345d7fedcf.tar.bz2
gsoc2013-empathy-feab20693e67e58701010c2a4613d8345d7fedcf.tar.lz
gsoc2013-empathy-feab20693e67e58701010c2a4613d8345d7fedcf.tar.xz
gsoc2013-empathy-feab20693e67e58701010c2a4613d8345d7fedcf.tar.zst
gsoc2013-empathy-feab20693e67e58701010c2a4613d8345d7fedcf.zip
use tp_g_signal_connect_object so we don't have to disconnect empathy_call_window_video_stream_changed_cb manually
-rw-r--r--src/empathy-call-window.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 34f899066..3ed346fe5 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -30,6 +30,7 @@
#include <glib/gi18n.h>
#include <telepathy-farsight/channel.h>
+#include <telepathy-glib/util.h>
#include <gst/farsight/fs-element-added-notifier.h>
@@ -1395,8 +1396,6 @@ empathy_call_window_dispose (GObject *object)
if (call != NULL)
{
- g_signal_handlers_disconnect_by_func (call,
- empathy_call_window_video_stream_changed_cb, object);
g_object_unref (call);
}
@@ -2117,8 +2116,9 @@ empathy_call_window_connected (gpointer user_data)
g_object_get (priv->handler, "tp-call", &call, NULL);
- g_signal_connect (call, "notify::video-stream",
- G_CALLBACK (empathy_call_window_video_stream_changed_cb), self);
+ tp_g_signal_connect_object (call, "notify::video-stream",
+ G_CALLBACK (empathy_call_window_video_stream_changed_cb),
+ G_OBJECT (self), 0);
if (empathy_tp_call_has_dtmf (call))
gtk_widget_set_sensitive (priv->dtmf_panel, TRUE);