X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstatusicon.h;h=36de4e67dffec7118754f3465c46fd00f04fabbd;hb=fd51c8f5e9d6fb68c8e81b9b1e2ab80931f963f0;hp=0c08cfe212450f54eb7d110fe99f291226b15ec5;hpb=97a1a28bcb926e9e8f0f738f09f7ffe95dcbfdf5;p=~andy%2Fgtk
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
old mode 100755
new mode 100644
index 0c08cfe21..36de4e67d
--- 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 .
*
* Authors:
* Mark McLoughlin
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only 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 can be included directly."
+#endif
+
#include
#include
@@ -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);
@@ -110,10 +110,6 @@ void gtk_status_icon_set_screen (GtkStatusIcon *st
GdkScreen *screen);
GdkScreen *gtk_status_icon_get_screen (GtkStatusIcon *status_icon);
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_status_icon_set_tooltip (GtkStatusIcon *status_icon,
- const gchar *tooltip_text);
-#endif
void gtk_status_icon_set_has_tooltip (GtkStatusIcon *status_icon,
gboolean has_tooltip);
void gtk_status_icon_set_tooltip_text (GtkStatusIcon *status_icon,
@@ -122,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,