testgtk: Use symbolic names for button numbers

[~andy/gtk] / gtk / gtkstatusicon.h

diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index 9142367b1235ecdb08b81676d0c1dd0d384be1d7..758ed0a9fadb816db01a19674bc5b35fb43c7281 100644 (file)
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -48,7 +48,7 @@ struct _GtkStatusIcon
 {
   GObject               parent_instance;
 
-  GtkStatusIconPrivate *GSEAL (priv);
+  GtkStatusIconPrivate *priv;
 };
 
 struct _GtkStatusIconClass
@@ -75,6 +75,8 @@ struct _GtkStatusIconClass
 
   void (*__gtk_reserved1);
   void (*__gtk_reserved2);
+  void (*__gtk_reserved3);
+  void (*__gtk_reserved4);
 };
 
 GType                 gtk_status_icon_get_type           (void) G_GNUC_CONST;
@@ -100,8 +102,8 @@ void                  gtk_status_icon_set_from_gicon     (GtkStatusIcon      *st
 GtkImageType          gtk_status_icon_get_storage_type   (GtkStatusIcon      *status_icon);
 
 GdkPixbuf            *gtk_status_icon_get_pixbuf         (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
 GIcon                *gtk_status_icon_get_gicon          (GtkStatusIcon      *status_icon);
 
 gint                  gtk_status_icon_get_size           (GtkStatusIcon      *status_icon);
@@ -118,17 +120,13 @@ void                  gtk_status_icon_set_tooltip_markup (GtkStatusIcon      *st
                                                           const gchar        *markup);
 void                  gtk_status_icon_set_title          (GtkStatusIcon      *status_icon,
                                                           const gchar        *title);
-G_CONST_RETURN gchar *gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
 void                  gtk_status_icon_set_name           (GtkStatusIcon      *status_icon,
                                                           const gchar        *name);
 void                  gtk_status_icon_set_visible        (GtkStatusIcon      *status_icon,
                                                          gboolean            visible);
 gboolean              gtk_status_icon_get_visible        (GtkStatusIcon      *status_icon);
 
-void                  gtk_status_icon_set_blinking       (GtkStatusIcon      *status_icon,
-                                                         gboolean            blinking);
-gboolean              gtk_status_icon_get_blinking       (GtkStatusIcon      *status_icon);
-
 gboolean              gtk_status_icon_is_embedded        (GtkStatusIcon      *status_icon);
 
 void                  gtk_status_icon_position_menu      (GtkMenu            *menu,