]> git.0d.be Git - empathy.git/commitdiff
status_icon_update_tooltip: display a translated version of the default status string
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 23 Dec 2009 15:45:33 +0000 (15:45 +0000)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 24 Dec 2009 09:44:55 +0000 (09:44 +0000)
src/empathy-status-icon.c

index b137daf721181d21321165031c66c7dd9a2aeebf..b7555598d5cca9795e22afc5b2505a9d772f82f3 100644 (file)
@@ -209,9 +209,10 @@ static void
 status_icon_update_tooltip (EmpathyStatusIcon *icon)
 {
        EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-       gchar                 *tooltip = NULL;
 
        if (priv->event) {
+               gchar *tooltip = NULL;
+
                if (priv->event->message != NULL)
                                tooltip = g_markup_printf_escaped ("<i>%s</i>\n%s",
                                                                   priv->event->header,
@@ -220,13 +221,16 @@ status_icon_update_tooltip (EmpathyStatusIcon *icon)
                                tooltip = g_markup_printf_escaped ("<i>%s</i>",
                                                                   priv->event->header);
                gtk_status_icon_set_tooltip_markup (priv->icon, tooltip);
+               g_free (tooltip);
        } else {
-               tp_account_manager_get_most_available_presence (
-                       priv->account_manager, &tooltip, NULL);
-               gtk_status_icon_set_tooltip_text (priv->icon, tooltip);
-       }
+               TpConnectionPresenceType type;
 
-       g_free (tooltip);
+               type = tp_account_manager_get_most_available_presence (
+                       priv->account_manager, NULL, NULL);
+
+               gtk_status_icon_set_tooltip_text (priv->icon,
+                                       empathy_presence_get_default_message (type));
+       }
 }
 
 static void