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

Fix to gtkstatusicon.c to allow building both X11 and Quartz backends

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=739005
This commit is contained in:
Brion Vibber 2014-10-22 05:36:23 -07:00 committed by Matthias Clasen
parent 2893a71a3e
commit 1bad7865d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/deprecated/gtkstatusicon.c
View File

@ -2599,8 +2599,6 @@ gtk_status_icon_set_tooltip_markup (GtkStatusIcon *status_icon,
{ {
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
GtkStatusIconPrivate *priv; GtkStatusIconPrivate *priv;
#else
gchar *text = NULL;
#endif #endif
g_return_if_fail (GTK_IS_STATUS_ICON (status_icon)); g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
@ -2612,12 +2610,14 @@ gtk_status_icon_set_tooltip_markup (GtkStatusIcon *status_icon,
gtk_widget_set_tooltip_markup (priv->tray_icon, markup); gtk_widget_set_tooltip_markup (priv->tray_icon, markup);
#endif #endif
#ifdef GDK_WINDOWING_WIN32 #ifdef GDK_WINDOWING_WIN32
gchar *text = NULL;
if (markup) if (markup)
pango_parse_markup (markup, -1, 0, NULL, &text, NULL, NULL); pango_parse_markup (markup, -1, 0, NULL, &text, NULL, NULL);
gtk_status_icon_set_tooltip_text (status_icon, text); gtk_status_icon_set_tooltip_text (status_icon, text);
g_free (text); g_free (text);
#endif #endif
#ifdef GDK_WINDOWING_QUARTZ #ifdef GDK_WINDOWING_QUARTZ
gchar *text = NULL;
if (markup) if (markup)
pango_parse_markup (markup, -1, 0, NULL, &text, NULL, NULL); pango_parse_markup (markup, -1, 0, NULL, &text, NULL, NULL);
gtk_status_icon_set_tooltip_text (status_icon, text); gtk_status_icon_set_tooltip_text (status_icon, text);