aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-12-23 23:53:15 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-12-24 17:44:55 +0800
commit50f96722448f152b8bfe0c24501c4b1eb0136359 (patch)
tree1c195cd92cda092d7415331da1dbfaf6a7aba605
parent3e44a8a3c4268a401f4a2869ee4b8a806d23c51a (diff)
downloadgsoc2013-empathy-50f96722448f152b8bfe0c24501c4b1eb0136359.tar
gsoc2013-empathy-50f96722448f152b8bfe0c24501c4b1eb0136359.tar.gz
gsoc2013-empathy-50f96722448f152b8bfe0c24501c4b1eb0136359.tar.bz2
gsoc2013-empathy-50f96722448f152b8bfe0c24501c4b1eb0136359.tar.lz
gsoc2013-empathy-50f96722448f152b8bfe0c24501c4b1eb0136359.tar.xz
gsoc2013-empathy-50f96722448f152b8bfe0c24501c4b1eb0136359.tar.zst
gsoc2013-empathy-50f96722448f152b8bfe0c24501c4b1eb0136359.zip
status_icon_update_tooltip: display the custom status msg, if any (#604481)
-rw-r--r--src/empathy-status-icon.c14
1 files changed, 11 insertions, 3 deletions
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);
}
}