luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-23 01:18:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

renamed GUnowned to GInitiallyUnowned.

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

        * gobject.[hc]: renamed GUnowned to GInitiallyUnowned.
This commit is contained in:
Tim Janik
2005-12-22 17:58:21 +00:00
committed by Tim Janik
parent 6f01d0c34f
commit 648da9d63f
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gobject/ChangeLog
View File

@@ -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> Thu Dec 22 14:59:24 2005 Tim Janik <timj@imendio.com>
* gvaluetypes.[hc]: implemented G_TYPE_GTPYE. applied patch * gvaluetypes.[hc]: implemented G_TYPE_GTPYE. applied patch

8
gobject/gobject.c
View File

@@ -2205,7 +2205,7 @@ g_object_compat_control (gsize what,
switch (what) switch (what)
{ {
case 1: /* floating base type */ 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 */ case 2: /* FIXME: remove this once GLib/Gtk+ break ABI again */
floating_flag_handler = (guint(*)(GObject*,gint)) data; floating_flag_handler = (guint(*)(GObject*,gint)) data;
return 1; 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 static void
g_unowned_init (GUnowned *object) g_initially_unowned_init (GInitiallyUnowned *object)
{ {
g_object_force_floating (object); g_object_force_floating (object);
} }
static void static void
g_unowned_class_init (GUnownedClass *klass) g_initially_unowned_class_init (GInitiallyUnownedClass *klass)
{ {
} }

20
gobject/gobject.h
View File

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