aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-22 21:34:38 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-09 19:06:30 +0800
commitb9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4 (patch)
tree532e9f0961babc0a78967ef77a5c547bd8662588
parente55ee9e0a53d9f51aac4a1c94af38bed1e048e72 (diff)
downloadgsoc2013-empathy-b9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4.tar
gsoc2013-empathy-b9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4.tar.gz
gsoc2013-empathy-b9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4.tar.bz2
gsoc2013-empathy-b9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4.tar.lz
gsoc2013-empathy-b9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4.tar.xz
gsoc2013-empathy-b9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4.tar.zst
gsoc2013-empathy-b9e87dc7d7bf94ea2bd39dd675cf1806cf34bbe4.zip
src/empathy-call-window.c: use tp_g_signal_connect_object instead of empathy_signal_connect_weak
-rw-r--r--src/empathy-call-window.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index ca814cbc2..8dc0d550f 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -29,6 +29,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <telepathy-glib/util.h>
#include <telepathy-farsight/channel.h>
#include <telepathy-glib/util.h>
@@ -651,9 +652,9 @@ create_audio_input (EmpathyCallWindow *self)
gst_object_ref (priv->audio_input);
gst_object_sink (priv->audio_input);
- empathy_signal_connect_weak (priv->audio_input, "peak-level-changed",
+ tp_g_signal_connect_object (priv->audio_input, "peak-level-changed",
G_CALLBACK (empathy_call_window_audio_input_level_changed_cb),
- G_OBJECT (self));
+ self, 0);
}
static void
@@ -2162,7 +2163,7 @@ empathy_call_window_connected (gpointer user_data)
tp_g_signal_connect_object (call, "notify::video-stream",
G_CALLBACK (empathy_call_window_video_stream_changed_cb),
- G_OBJECT (self), 0);
+ self, 0);
if (empathy_tp_call_has_dtmf (call))
gtk_widget_set_sensitive (priv->dtmf_panel, TRUE);
@@ -2492,10 +2493,10 @@ call_handler_notify_tp_call_cb (EmpathyCallHandler *handler,
if (call == NULL)
return;
- empathy_signal_connect_weak (call, "audio-stream-error",
- G_CALLBACK (empathy_call_window_audio_stream_error), G_OBJECT (self));
- empathy_signal_connect_weak (call, "video-stream-error",
- G_CALLBACK (empathy_call_window_video_stream_error), G_OBJECT (self));
+ tp_g_signal_connect_object (call, "audio-stream-error",
+ G_CALLBACK (empathy_call_window_audio_stream_error), self, 0);
+ tp_g_signal_connect_object (call, "video-stream-error",
+ G_CALLBACK (empathy_call_window_video_stream_error), self, 0);
g_object_unref (call);
}
@@ -2522,10 +2523,12 @@ empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
g_object_get (priv->handler, "tp-call", &call, NULL);
if (call != NULL)
{
- empathy_signal_connect_weak (call, "audio-stream-error",
- G_CALLBACK (empathy_call_window_audio_stream_error), G_OBJECT (window));
- empathy_signal_connect_weak (call, "video-stream-error",
- G_CALLBACK (empathy_call_window_video_stream_error), G_OBJECT (window));
+ tp_g_signal_connect_object (call, "audio-stream-error",
+ G_CALLBACK (empathy_call_window_audio_stream_error), window,
+ 0);
+ tp_g_signal_connect_object (call, "video-stream-error",
+ G_CALLBACK (empathy_call_window_video_stream_error), window,
+ 0);
g_object_unref (call);
}