empathy r2745 - in trunk: . src

[fpeters svn gnome org]

Author: fpeters
Date: Thu Mar 26 21:50:22 2009
New Revision: 2745
URL: http://svn.gnome.org/viewvc/empathy?rev=2745&view=rev

Log:
use new GtkStatusIcon tooltip methods, formatting the header in italics.
(requires new GTK+ version, bumped dependency to 2.16.0) (bug #575265)


Modified:
   trunk/configure.ac
   trunk/src/empathy-status-icon.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Mar 26 21:50:22 2009
@@ -26,7 +26,7 @@
 
 # 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

Modified: trunk/src/empathy-status-icon.c
==============================================================================
--- trunk/src/empathy-status-icon.c	(original)
+++ trunk/src/empathy-status-icon.c	Thu Mar 26 21:50:22 2009
@@ -171,22 +171,18 @@
 
 	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);
 }