Add GtkBubbleWindow

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

diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index 6bfafef3da1fd38a6099b54ca6784ad488a6b136..36de4e67dffec7118754f3465c46fd00f04fabbd 100644 (file)
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -13,21 +13,19 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
  *      Mark McLoughlin <mark@skynet.ie>
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_STATUS_ICON_H__
 #define __GTK_STATUS_ICON_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkimage.h>
 #include <gtk/gtkmenu.h>
 
@@ -48,7 +46,7 @@ struct _GtkStatusIcon
 {
   GObject               parent_instance;
 
-  GtkStatusIconPrivate *GSEAL (priv);
+  GtkStatusIconPrivate *priv;
 };
 
 struct _GtkStatusIconClass
@@ -75,6 +73,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 +100,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 +118,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,