we need signal.h for G_BREAKPOINT().

[platform/upstream/glib.git] / gobject / gobject.h

diff --git a/gobject/gobject.h b/gobject/gobject.h
index 43740f0..5d34232 100644 (file)
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -24,6 +24,7 @@
 #include        <gobject/gparam.h>
 #include        <gobject/gclosure.h>
 #include        <gobject/gsignal.h>
+#include        <signal.h>
 
 G_BEGIN_DECLS
 
@@ -54,7 +55,8 @@ typedef void (*GObjectSetPropertyFunc)  (GObject      *object,
                                          const GValue *value,
                                          GParamSpec   *pspec);
 typedef void (*GObjectFinalizeFunc)     (GObject      *object);
-typedef void (*GWeakNotify)            (gpointer      data);
+typedef void (*GWeakNotify)            (gpointer      data,
+                                        GObject      *where_the_object_was);
 struct  _GObject
 {
   GTypeInstance g_type_instance;
@@ -115,10 +117,10 @@ gpointer    g_object_new                      (GType           object_type,
 gpointer    g_object_newv                    (GType           object_type,
                                               guint           n_parameters,
                                               GParameter     *parameters);
-gpointer    g_object_new_valist               (GType           object_type,
+GObject*    g_object_new_valist               (GType           object_type,
                                               const gchar    *first_property_name,
                                               va_list         var_args);
-gpointer    g_object_set                      (gpointer               object,
+void       g_object_set                      (gpointer        object,
                                               const gchar    *first_property_name,
                                               ...);
 void        g_object_get                      (gpointer        object,
@@ -127,7 +129,7 @@ void        g_object_get                      (gpointer        object,
 gpointer    g_object_connect                  (gpointer               object,
                                               const gchar    *signal_spec,
                                               ...);
-gpointer    g_object_disconnect               (gpointer               object,
+void       g_object_disconnect               (gpointer        object,
                                               const gchar    *signal_spec,
                                               ...);
 void        g_object_set_valist               (GObject        *object,
@@ -154,6 +156,10 @@ void           g_object_weak_ref                 (GObject        *object,
 void       g_object_weak_unref               (GObject        *object,
                                               GWeakNotify     notify,
                                               gpointer        data);
+void        g_object_add_weak_pointer         (GObject        *object, 
+                                               gpointer       *weak_pointer_location);
+void        g_object_remove_weak_pointer      (GObject        *object, 
+                                               gpointer       *weak_pointer_location);
 gpointer    g_object_get_qdata                (GObject        *object,
                                               GQuark          quark);
 void        g_object_set_qdata                (GObject        *object,
@@ -179,9 +185,9 @@ gpointer    g_object_steal_data               (GObject        *object,
 void        g_object_watch_closure            (GObject        *object,
                                               GClosure       *closure);
 GClosure*   g_cclosure_new_object             (GCallback       callback_func,
-                                              gpointer        object);
+                                              GObject        *object);
 GClosure*   g_cclosure_new_object_swap        (GCallback       callback_func,
-                                              gpointer        object);
+                                              GObject        *object);
 GClosure*   g_closure_new_object              (guint           sizeof_closure,
                                               GObject        *object);
 void        g_value_set_object                (GValue         *value,