renamed GUnowned to GInitiallyUnowned.

Thu Dec 22 18:53:14 2005  Tim Janik  <timj@gtk.org>

        * gobject.[hc]: renamed GUnowned to GInitiallyUnowned.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 9572467..2ba9390 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 22 18:53:14 2005  Tim Janik  <timj@gtk.org>
+
+       * gobject.[hc]: renamed GUnowned to GInitiallyUnowned.
+
 Thu Dec 22 14:59:24 2005  Tim Janik  <timj@imendio.com>
 
        * gvaluetypes.[hc]: implemented G_TYPE_GTPYE. applied patch

diff --git a/gobject/gobject.c b/gobject/gobject.c
index 91d39a8..27c2b9c 100644 (file)
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -2205,7 +2205,7 @@ g_object_compat_control (gsize           what,
   switch (what)
     {
     case 1:     /* floating base type */
-      return G_TYPE_UNOWNED;
+      return G_TYPE_INITIALLY_UNOWNED;
     case 2:     /* FIXME: remove this once GLib/Gtk+ break ABI again */
       floating_flag_handler = (guint(*)(GObject*,gint)) data;
       return 1;
@@ -2214,16 +2214,16 @@ g_object_compat_control (gsize           what,
     }
 }
 
-G_DEFINE_TYPE (GUnowned, g_unowned, G_TYPE_OBJECT);
+G_DEFINE_TYPE (GInitiallyUnowned, g_initially_unowned, G_TYPE_OBJECT);
 
 static void
-g_unowned_init (GUnowned *object)
+g_initially_unowned_init (GInitiallyUnowned *object)
 {
   g_object_force_floating (object);
 }
 
 static void
-g_unowned_class_init (GUnownedClass *klass)
+g_initially_unowned_class_init (GInitiallyUnownedClass *klass)
 {
 }
 

diff --git a/gobject/gobject.h b/gobject/gobject.h
index 71ba6d5..0e9b6a8 100644 (file)
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -45,20 +45,20 @@ G_BEGIN_DECLS
 #define G_VALUE_HOLDS_OBJECT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_OBJECT))
 
 /* --- type macros --- */
-#define G_TYPE_UNOWNED             (g_unowned_get_type())
-#define G_UNOWNED(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_UNOWNED, GUnowned))
-#define G_UNOWNED_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_UNOWNED, GUnownedClass))
-#define G_IS_UNOWNED(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_UNOWNED))
-#define G_IS_UNOWNED_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_UNOWNED))
-#define G_UNOWNED_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_UNOWNED, GUnownedClass))
-/* GUnowned ia a GObject with initially floating reference count */
+#define G_TYPE_INITIALLY_UNOWNED             (g_initially_unowned_get_type())
+#define G_INITIALLY_UNOWNED(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnowned))
+#define G_INITIALLY_UNOWNED_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
+#define G_IS_INITIALLY_UNOWNED(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_INITIALLY_UNOWNED))
+#define G_IS_INITIALLY_UNOWNED_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_INITIALLY_UNOWNED))
+#define G_INITIALLY_UNOWNED_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
+/* GInitiallyUnowned ia a GObject with initially floating reference count */
 
 
 /* --- typedefs & structures --- */
 typedef struct _GObject                  GObject;
 typedef struct _GObjectClass             GObjectClass;
-typedef struct _GObject                  GUnowned;
-typedef struct _GObjectClass             GUnownedClass;
+typedef struct _GObject                  GInitiallyUnowned;
+typedef struct _GObjectClass             GInitiallyUnownedClass;
 typedef struct _GObjectConstructParam    GObjectConstructParam;
 typedef void (*GObjectGetPropertyFunc)  (GObject      *object,
                                          guint         property_id,
@@ -122,7 +122,7 @@ struct _GObjectConstructParam
 
 
 /* --- prototypes --- */
-GType       g_unowned_get_type                (void);
+GType       g_initially_unowned_get_type      (void);
 void        g_object_class_install_property   (GObjectClass   *oclass,
                                               guint           property_id,
                                               GParamSpec     *pspec);