use new GtkStatusIcon tooltip methods, formatting the header in italics.

(requires new GTK+ version, bumped dependency to 2.16.0) (bug #575265)

svn path=/trunk/; revision=2745

diff --git a/configure.ac b/configure.ac
index 4ffa8d3e729b0fda9c2a4a124703f040fd0275db..f0fcf820163ab95abc251281874d2f219a0d6a1a 100644 (file)
--- 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 492c37a85960ad0f1c05ddb9c648480490a0b5d6..214e31e16f4f95db3d53d41975f89023f46c1a42 100644 (file)
--- 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);
 }