[empathy] status_icon_update_tooltip: display a translated version of the default status string
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy] status_icon_update_tooltip: display a translated version of the default status string
- Date: Thu, 24 Dec 2009 09:45:10 +0000 (UTC)
commit 3e44a8a3c4268a401f4a2869ee4b8a806d23c51a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Dec 23 15:45:33 2009 +0000
status_icon_update_tooltip: display a translated version of the default status string
src/empathy-status-icon.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index b137daf..b755559 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]