gtk+ r21758 - in trunk: . gtk

[rhult svn gnome org]

Author: rhult
Date: Wed Nov  5 10:24:30 2008
New Revision: 21758
URL: http://svn.gnome.org/viewvc/gtk+?rev=21758&view=rev

Log:
2008-11-05  Richard Hult  <richard imendio com>

	* gtk/gtkstatusicon.c: (gtk_status_icon_set_has_tooltip),
	(gtk_status_icon_get_tooltip_markup): Fix build for win32 and
	quartz.


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkstatusicon.c

Modified: trunk/gtk/gtkstatusicon.c
==============================================================================
--- trunk/gtk/gtkstatusicon.c	(original)
+++ trunk/gtk/gtkstatusicon.c	Wed Nov  5 10:24:30 2008
@@ -2594,11 +2594,11 @@
 #endif
 #ifdef GDK_WINDOWING_WIN32
   if (!has_tooltip && priv->tooltip_text)
-    gtk_tray_icon_set_tooltip_text (status_icon, NULL);
+    gtk_status_icon_set_tooltip_text (status_icon, NULL);
 #endif
 #ifdef GDK_WINDOWING_QUARTZ
   if (!has_tooltip && priv->tooltip_text)
-    gtk_tray_icon_set_tooltip_text (status_icon, NULL);
+    gtk_status_icon_set_tooltip_text (status_icon, NULL);
 #endif
 }
 
@@ -2804,11 +2804,11 @@
 #endif
 #ifdef GDK_WINDOWING_WIN32
   if (priv->tooltip_text)
-    markup = g_markup_escape_text (priv->tooltip_text);
+    markup = g_markup_escape_text (priv->tooltip_text, -1);
 #endif
 #ifdef GDK_WINDOWING_QUARTZ
   if (priv->tooltip_text)
-    markup = g_markup_escape_text (priv->tooltip_text);
+    markup = g_markup_escape_text (priv->tooltip_text, -1);
 #endif
 
   return markup;