AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

GtkStatusIcon: Use G_PARAM_EXPLICIT_NOTIFY

Browse Source
This commit is contained in:
Matthias Clasen 2014-06-09 09:41:48 -04:00
parent 9321b30b0b
commit 1208539eff
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkstatusicon.c
View File

@ -302,7 +302,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
P_("Visible"), P_("Visible"),
P_("Whether the status icon is visible"), P_("Whether the status icon is visible"),
TRUE, TRUE,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
/** /**
@ -362,7 +362,8 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
P_("Has tooltip"), P_("Has tooltip"),
P_("Whether this tray icon has a tooltip"), P_("Whether this tray icon has a tooltip"),
FALSE, FALSE,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkStatusIcon:tooltip-text: * GtkStatusIcon:tooltip-text:
* *
@ -2374,6 +2375,7 @@ gtk_status_icon_set_has_tooltip (GtkStatusIcon *status_icon,
gboolean has_tooltip) gboolean has_tooltip)
{ {
GtkStatusIconPrivate *priv; GtkStatusIconPrivate *priv;
gboolean changed = FALSE;
g_return_if_fail (GTK_IS_STATUS_ICON (status_icon)); g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
@ -2381,16 +2383,27 @@ gtk_status_icon_set_has_tooltip (GtkStatusIcon *status_icon,
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
if (priv->tray_icon) if (priv->tray_icon)
gtk_widget_set_has_tooltip (priv->tray_icon, has_tooltip); {
if (gtk_widget_get_has_tooltip (priv->tray_icon) != has_tooltip)
{
gtk_widget_set_has_tooltip (priv->tray_icon, has_tooltip);
changed = TRUE;
}
}
#endif #endif
#ifdef GDK_WINDOWING_WIN32 #ifdef GDK_WINDOWING_WIN32
changed = TRUE;
if (!has_tooltip && priv->tooltip_text) if (!has_tooltip && priv->tooltip_text)
gtk_status_icon_set_tooltip_text (status_icon, NULL); gtk_status_icon_set_tooltip_text (status_icon, NULL);
#endif #endif
#ifdef GDK_WINDOWING_QUARTZ #ifdef GDK_WINDOWING_QUARTZ
changed = TRUE;
if (!has_tooltip && priv->tooltip_text) if (!has_tooltip && priv->tooltip_text)
gtk_status_icon_set_tooltip_text (status_icon, NULL); gtk_status_icon_set_tooltip_text (status_icon, NULL);
#endif #endif
if (changed)
g_object_notify (G_OBJECT (status_icon), "has-tooltip");
} }
/** /**