aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2010-08-12 01:51:28 +0800
committerPhilip Withnall <philip.withnall@collabora.co.uk>2010-08-20 02:15:21 +0800
commit4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9 (patch)
tree96e23a7db617897a1a963fb841a7b46ea34b601b
parentb733c20124b92b6dedec267eee6b586b312e5d5b (diff)
downloadgsoc2013-empathy-4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9.tar
gsoc2013-empathy-4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9.tar.gz
gsoc2013-empathy-4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9.tar.bz2
gsoc2013-empathy-4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9.tar.lz
gsoc2013-empathy-4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9.tar.xz
gsoc2013-empathy-4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9.tar.zst
gsoc2013-empathy-4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9.zip
Use EmpathyIndividualWidget in EmpathyIndividualView tooltips
-rw-r--r--libempathy-gtk/empathy-individual-view.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 1c073fd60..28c3069ab 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -176,7 +176,6 @@ individual_view_query_tooltip_cb (EmpathyIndividualView *view,
GtkTreePath *path;
static gint running = 0;
gboolean ret = FALSE;
- EmpathyContact *contact;
priv = GET_PRIV (view);
@@ -203,17 +202,11 @@ individual_view_query_tooltip_cb (EmpathyIndividualView *view,
if (individual == NULL)
goto OUT;
- contact = empathy_contact_dup_from_folks_individual (individual);
- g_object_unref (individual);
-
- if (contact == NULL)
- goto OUT;
-
if (priv->tooltip_widget == NULL)
{
- priv->tooltip_widget = empathy_contact_widget_new (contact,
- EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP |
- EMPATHY_CONTACT_WIDGET_SHOW_LOCATION);
+ priv->tooltip_widget = empathy_individual_widget_new (individual,
+ EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP |
+ EMPATHY_INDIVIDUAL_WIDGET_SHOW_LOCATION);
gtk_container_set_border_width (GTK_CONTAINER (priv->tooltip_widget), 8);
g_object_ref (priv->tooltip_widget);
g_signal_connect (priv->tooltip_widget, "destroy",
@@ -221,12 +214,15 @@ individual_view_query_tooltip_cb (EmpathyIndividualView *view,
gtk_widget_show (priv->tooltip_widget);
}
else
- empathy_contact_widget_set_contact (priv->tooltip_widget, contact);
+ {
+ empathy_individual_widget_set_individual (
+ EMPATHY_INDIVIDUAL_WIDGET (priv->tooltip_widget), individual);
+ }
gtk_tooltip_set_custom (tooltip, priv->tooltip_widget);
ret = TRUE;
- g_object_unref (contact);
+ g_object_unref (individual);
OUT:
running--;