Make the new GtkAction code work with PolicyKit-gnome's use of actions.

[~andy/gtk] / gtk / gtkobject.c

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 1b9d78215d15567bb333e7d06617ad0cafd00705..a90f26bb6936cfb9ebf0a9d0df4ad5dba6d70b97 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -24,15 +24,19 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkobject.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtksignal.h"
 #include "gtkprivate.h"
+
 #include "gtkalias.h"
 
 
@@ -46,7 +50,6 @@ enum {
 };
 
 
-extern void      gtk_object_init_type           (void);        /* for gtktypeutils.h */
 static void       gtk_object_base_class_init     (GtkObjectClass *class);
 static void       gtk_object_base_class_finalize (GtkObjectClass *class);
 static void       gtk_object_class_init          (GtkObjectClass *klass);
@@ -82,7 +85,7 @@ gtk_object_get_type (void)
 
   if (!object_type)
     {
-      static const GTypeInfo object_info =
+      const GTypeInfo object_info =
       {
        sizeof (GtkObjectClass),
        (GBaseInitFunc) gtk_object_base_class_init,
@@ -213,7 +216,7 @@ gtk_arg_proxy_get_property (GObject     *object,
 
 void
 gtk_object_add_arg_type (const gchar *arg_name,
-                        GtkType      arg_type,
+                        GType        arg_type,
                         guint        arg_flags,
                         guint        arg_id)
 {
@@ -517,15 +520,15 @@ typedef struct _GtkWeakRef        GtkWeakRef;
 
 struct _GtkWeakRef
 {
-  GtkWeakRef      *next;
-  GtkDestroyNotify  notify;
-  gpointer          data;
+  GtkWeakRef    *next;
+  GDestroyNotify  notify;
+  gpointer        data;
 };
 
 void
-gtk_object_weakref (GtkObject        *object,
-                   GtkDestroyNotify  notify,
-                   gpointer          data)
+gtk_object_weakref (GtkObject      *object,
+                   GDestroyNotify  notify,
+                   gpointer        data)
 {
   GtkWeakRef *weak;
 
@@ -543,9 +546,9 @@ gtk_object_weakref (GtkObject        *object,
 }
 
 void
-gtk_object_weakunref (GtkObject        *object,
-                     GtkDestroyNotify  notify,
-                     gpointer          data)
+gtk_object_weakunref (GtkObject      *object,
+                     GDestroyNotify  notify,
+                     gpointer        data)
 {
   GtkWeakRef *weaks, *w, **wp;
 
@@ -590,7 +593,7 @@ gtk_object_notify_weaks (GtkObject *object)
 }
 
 GtkObject*
-gtk_object_new (GtkType      object_type,
+gtk_object_new (GType        object_type,
                const gchar *first_property_name,
                ...)
 {
@@ -661,10 +664,10 @@ gtk_object_set_data (GtkObject        *object,
 }
 
 void
-gtk_object_set_data_by_id_full (GtkObject        *object,
-                               GQuark            data_id,
-                               gpointer          data,
-                               GtkDestroyNotify  destroy)
+gtk_object_set_data_by_id_full (GtkObject      *object,
+                               GQuark          data_id,
+                               gpointer        data,
+                               GDestroyNotify  destroy)
 {
   g_return_if_fail (GTK_IS_OBJECT (object));
 
@@ -672,10 +675,10 @@ gtk_object_set_data_by_id_full (GtkObject        *object,
 }
 
 void
-gtk_object_set_data_full (GtkObject        *object,
-                         const gchar      *key,
-                         gpointer          data,
-                         GtkDestroyNotify  destroy)
+gtk_object_set_data_full (GtkObject      *object,
+                         const gchar    *key,
+                         gpointer        data,
+                         GDestroyNotify  destroy)
 {
   g_return_if_fail (GTK_IS_OBJECT (object));
   g_return_if_fail (key != NULL);