From 9f9170e3aa46ee400400776cec4745005072a232 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 2 Sep 2010 11:28:18 -0400 Subject: [PATCH] Deprecate blinking status icons Just a bad idea... --- gtk/gtk.symbols | 6 +++++- gtk/gtkstatusicon.c | 13 ++++++++++++- gtk/gtkstatusicon.h | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index d608b0e4f..d62a0b503 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -1147,7 +1147,6 @@ gtk_dialog_add_button gtk_dialog_add_buttons G_GNUC_NULL_TERMINATED gtk_dialog_get_action_area gtk_dialog_get_content_area -gtk_dialog_get_has_separator gtk_dialog_get_widget_for_response gtk_dialog_get_response_for_widget gtk_dialog_get_type G_GNUC_CONST @@ -1159,7 +1158,10 @@ gtk_alternative_dialog_button_order gtk_dialog_set_alternative_button_order gtk_dialog_set_alternative_button_order_from_array gtk_dialog_set_default_response +#ifndef GTK_DISABLE_DEPRECATED +gtk_dialog_get_has_separator gtk_dialog_set_has_separator +#endif gtk_dialog_set_response_sensitive #endif #endif @@ -1240,8 +1242,10 @@ gtk_status_icon_set_has_tooltip gtk_status_icon_get_has_tooltip gtk_status_icon_set_visible gtk_status_icon_get_visible +#ifndef GTK_DISABLE_DEPRECATED gtk_status_icon_set_blinking gtk_status_icon_get_blinking +#endif gtk_status_icon_is_embedded gtk_status_icon_position_menu gtk_status_icon_get_geometry diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index dab6ff65e..aaea50fbe 100644 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -282,13 +282,20 @@ gtk_status_icon_class_init (GtkStatusIconClass *class) GDK_TYPE_SCREEN, GTK_PARAM_READWRITE)); + /** + * GtkStatusIcon:blinking: + * + * Whether or not the status icon is blinking. + * + * Deprecated: 2.22: This property will be removed in GTK+ 3 + */ g_object_class_install_property (gobject_class, PROP_BLINKING, g_param_spec_boolean ("blinking", P_("Blinking"), P_("Whether or not the status icon is blinking"), FALSE, - GTK_PARAM_READWRITE)); + GTK_PARAM_READWRITE | G_PARAM_DEPRECATED)); g_object_class_install_property (gobject_class, PROP_VISIBLE, @@ -2354,6 +2361,8 @@ gtk_status_icon_get_visible (GtkStatusIcon *status_icon) * this setting has no effect. * * Since: 2.10 + * + * Deprecated: 2.22: This function will be removed in GTK+ 3 **/ void gtk_status_icon_set_blinking (GtkStatusIcon *status_icon, @@ -2390,6 +2399,8 @@ gtk_status_icon_set_blinking (GtkStatusIcon *status_icon, * Return value: %TRUE if the icon is blinking * * Since: 2.10 + * + * Deprecated: 2.22: This function will be removed in GTK+ 3 **/ gboolean gtk_status_icon_get_blinking (GtkStatusIcon *status_icon) diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h index 0c08cfe21..74867b382 100644 --- a/gtk/gtkstatusicon.h +++ b/gtk/gtkstatusicon.h @@ -129,9 +129,11 @@ void gtk_status_icon_set_visible (GtkStatusIcon *st gboolean visible); gboolean gtk_status_icon_get_visible (GtkStatusIcon *status_icon); +#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) void gtk_status_icon_set_blinking (GtkStatusIcon *status_icon, gboolean blinking); gboolean gtk_status_icon_get_blinking (GtkStatusIcon *status_icon); +#endif gboolean gtk_status_icon_is_embedded (GtkStatusIcon *status_icon);