AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build for win32 and quartz.

Browse Source 
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
This commit is contained in:
Richard Hult 2008-11-05 10:24:30 +00:00 committed by Richard Hult
parent 09e3c540dc
commit 43c5ef3128
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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

8
gtk/gtkstatusicon.c
View File

@ -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;