[empathy] use tp_g_signal_connect_object so we don't have to disconnect empathy_call_window_video_stream_chang
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] use tp_g_signal_connect_object so we don't have to disconnect empathy_call_window_video_stream_chang
- Date: Thu, 1 Apr 2010 08:17:13 +0000 (UTC)
commit feab20693e67e58701010c2a4613d8345d7fedcf
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Mar 31 12:11:42 2010 +0200
use tp_g_signal_connect_object so we don't have to disconnect empathy_call_window_video_stream_changed_cb manually
src/empathy-call-window.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 34f8990..3ed346f 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]