Fix build for win32 and quartz.

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.

svn path=/trunk/; revision=21758

diff --git a/ChangeLog b/ChangeLog
index 3afeace6918caa208c9fc15df9641128d975bded..d2f83694e1995b529a3cded1384ea259caed8fa0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2008-11-04  Tor Lillqvist  <tml@novell.com>
 
        Bug 557212 - Problem with which window gains focus and is visible

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index d88c02442bbe900619e49633e7e447e17002a457..280beaaa64b3c8a3978235ec02dfc38095b176c7 100644 (file)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -2594,11 +2594,11 @@ gtk_status_icon_set_has_tooltip (GtkStatusIcon *status_icon,
 #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 @@ gtk_status_icon_get_tooltip_markup (GtkStatusIcon *status_icon)
 #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;