aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-06-07 21:41:00 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-06-15 19:41:08 +0800
commitc352f9677a26fd46f688e3e4f1126f7bc1071925 (patch)
treef1791d3a8e001cd8f6dbfcbc0b06d0327138b1c6
parent094e0583ad0361dd0981e5b9bf238a20e66248a3 (diff)
downloadgsoc2013-empathy-c352f9677a26fd46f688e3e4f1126f7bc1071925.tar
gsoc2013-empathy-c352f9677a26fd46f688e3e4f1126f7bc1071925.tar.gz
gsoc2013-empathy-c352f9677a26fd46f688e3e4f1126f7bc1071925.tar.bz2
gsoc2013-empathy-c352f9677a26fd46f688e3e4f1126f7bc1071925.tar.lz
gsoc2013-empathy-c352f9677a26fd46f688e3e4f1126f7bc1071925.tar.xz
gsoc2013-empathy-c352f9677a26fd46f688e3e4f1126f7bc1071925.tar.zst
gsoc2013-empathy-c352f9677a26fd46f688e3e4f1126f7bc1071925.zip
roster-window: use tp_g_signal_connect_object()
https://bugzilla.gnome.org/show_bug.cgi?id=677948
-rw-r--r--src/empathy-roster-window.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 29cf7c61f..0913b6195 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -1252,11 +1252,6 @@ empathy_roster_window_finalize (GObject *window)
g_hash_table_unref (self->priv->status_changed_handlers);
- g_signal_handlers_disconnect_by_func (self->priv->event_manager,
- roster_window_event_added_cb, self);
- g_signal_handlers_disconnect_by_func (self->priv->event_manager,
- roster_window_event_removed_cb, self);
-
g_object_unref (self->priv->call_observer);
g_object_unref (self->priv->event_manager);
g_object_unref (self->priv->chatroom_manager);
@@ -2295,10 +2290,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
self->priv->call_observer = empathy_call_observer_dup_singleton ();
self->priv->event_manager = empathy_event_manager_dup_singleton ();
- g_signal_connect (self->priv->event_manager, "event-added",
- G_CALLBACK (roster_window_event_added_cb), self);
- g_signal_connect (self->priv->event_manager, "event-removed",
- G_CALLBACK (roster_window_event_removed_cb), self);
+ tp_g_signal_connect_object (self->priv->event_manager, "event-added",
+ G_CALLBACK (roster_window_event_added_cb), self, 0);
+ tp_g_signal_connect_object (self->priv->event_manager, "event-removed",
+ G_CALLBACK (roster_window_event_removed_cb), self, 0);
g_signal_connect (self->priv->account_manager, "account-validity-changed",
G_CALLBACK (roster_window_account_validity_changed_cb), self);
g_signal_connect (self->priv->account_manager, "account-removed",