From c977e894c549b8bb146e23dd5ce88509a30c96cd Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 18 Jun 2012 13:15:17 +0200 Subject: roster-view: use a signal instead of a cb to handle individual tooltips https://bugzilla.gnome.org/show_bug.cgi?id=678294 --- src/empathy-roster-window.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/empathy-roster-window.c') diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index a1363fcee..abff479ad 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -1925,10 +1925,8 @@ individual_tooltip_cb (EmpathyRosterView *view, FolksIndividual *individual, gboolean keyboard_mode, GtkTooltip *tooltip, - gpointer user_data) + EmpathyRosterWindow *self) { - EmpathyRosterWindow *self = user_data; - if (self->priv->tooltip_widget == NULL) { self->priv->tooltip_widget = empathy_individual_widget_new (individual, @@ -2089,9 +2087,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self) G_CALLBACK (popup_individual_menu_cb), self); g_signal_connect (self->priv->view, "notify::empty", G_CALLBACK (view_empty_cb), self); + g_signal_connect (self->priv->view, "individual-tooltip", + G_CALLBACK (individual_tooltip_cb), self); - empathy_roster_view_set_individual_tooltip_cb (self->priv->view, - individual_tooltip_cb, self); + gtk_widget_set_has_tooltip (GTK_WIDGET (self->priv->view), TRUE); /* Set up search bar */ self->priv->search_bar = empathy_live_search_new ( -- cgit v1.2.3