From 50f96722448f152b8bfe0c24501c4b1eb0136359 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 23 Dec 2009 15:53:15 +0000 Subject: status_icon_update_tooltip: display the custom status msg, if any (#604481) --- src/empathy-status-icon.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/empathy-status-icon.c') diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index b7555598d..c6acb033f 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -224,12 +224,20 @@ status_icon_update_tooltip (EmpathyStatusIcon *icon) g_free (tooltip); } else { TpConnectionPresenceType type; + gchar *msg; type = tp_account_manager_get_most_available_presence ( - priv->account_manager, NULL, NULL); + priv->account_manager, NULL, &msg); + + if (!EMP_STR_EMPTY (msg)) { + gtk_status_icon_set_tooltip_text (priv->icon, msg); + } + else { + gtk_status_icon_set_tooltip_text (priv->icon, + empathy_presence_get_default_message (type)); + } - gtk_status_icon_set_tooltip_text (priv->icon, - empathy_presence_get_default_message (type)); + g_free (msg); } } -- cgit v1.2.3