[empathy] roster-window: use tp_g_signal_connect_object()
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] roster-window: use tp_g_signal_connect_object()
- Date: Fri, 15 Jun 2012 11:44:18 +0000 (UTC)
commit c352f9677a26fd46f688e3e4f1126f7bc1071925
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Jun 7 15:41:00 2012 +0200
roster-window: use tp_g_signal_connect_object()
https://bugzilla.gnome.org/show_bug.cgi?id=677948
src/empathy-roster-window.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 29cf7c6..0913b61 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",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]