diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/empathy-status-icon.c | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 4ffa8d3e7..f0fcf8201 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_SUBST(LIBEMPATHY_GTK_REVISION) # Minimal version required GLIB_REQUIRED=2.16.0 -GTK_REQUIRED=2.14.0 +GTK_REQUIRED=2.16.0 GCONF_REQUIRED=1.2.0 LIBGLADE_REQUIRED=2.0.0 LIBPANELAPPLET_REQUIRED=2.10.0 diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 492c37a85..214e31e16 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -171,22 +171,18 @@ status_icon_update_tooltip (EmpathyStatusIcon *icon) if (priv->event) { if (priv->event->message != NULL) - tooltip = g_strdup_printf ("%s\n%s", + tooltip = g_strdup_printf ("<i>%s</i>\n%s", priv->event->header, priv->event->message); else - tooltip = g_strdup (priv->event->header); - } - - if (!tooltip) { + tooltip = g_strdup_printf ("<i>%s</i>", + priv->event->header); + gtk_status_icon_set_tooltip_markup (priv->icon, tooltip); + } else { tooltip = g_strdup (empathy_idle_get_status (priv->idle)); + gtk_status_icon_set_tooltip_text (priv->icon, tooltip); } - /* FIXME: when we will depend on GTK+ 2.16.0, we should use - * gtk_status_icon_set_tooltip_markup () and make the header italic. - */ - gtk_status_icon_set_tooltip (priv->icon, tooltip); - g_free (tooltip); } |