luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix g_object_set() whithin _init() implementations not working for

Browse Source 
Sat Nov 29 14:57:20 2003  Tim Janik  <timj@gtk.org>

        * gobject.c: fix g_object_set() whithin _init() implementations
        not working for construct-only properties.
        (g_object_init): make the object enter a construct_objects list.
        (g_object_newv): remove object from construct_objects after creation.
        (g_object_set_valist):
        (g_object_set_property): allow construct-only properties for
        objects which are in construct_objects.
This commit is contained in:
Tim Janik 2003-11-29 14:00:06 +00:00 committed by Tim Janik
parent 5d49a7caf7
commit aa63f7e373
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gobject/ChangeLog
View File

@ -1,3 +1,13 @@
Sat Nov 29 14:57:20 2003 Tim Janik <timj@gtk.org>
* gobject.c: fix g_object_set() whithin _init() implementations
not working for construct-only properties.
(g_object_init): make the object enter a construct_objects list.
(g_object_newv): remove object from construct_objects after creation.
(g_object_set_valist):
(g_object_set_property): allow construct-only properties for
objects which are in construct_objects.
Thu Nov 27 17:53:52 2003 Tim Janik <timj@gtk.org> Thu Nov 27 17:53:52 2003 Tim Janik <timj@gtk.org>
* gtype.[hc]: * gtype.[hc]:

24
gobject/gobject.c
View File

@ -107,6 +107,8 @@ static GQuark quark_weak_refs = 0;
static GParamSpecPool *pspec_pool = NULL; static GParamSpecPool *pspec_pool = NULL;
static GObjectNotifyContext property_notify_context = { 0, }; static GObjectNotifyContext property_notify_context = { 0, };
static gulong gobject_signals[LAST_SIGNAL] = { 0, }; static gulong gobject_signals[LAST_SIGNAL] = { 0, };
G_LOCK_DEFINE_STATIC (construct_objects_lock);
static GSList *construct_objects = NULL;
/* --- functions --- */ /* --- functions --- */
@ -468,6 +470,11 @@ g_object_init (GObject *object)
/* freeze object's notification queue, g_object_newv() preserves pairedness */ /* freeze object's notification queue, g_object_newv() preserves pairedness */
g_object_notify_queue_freeze (object, &property_notify_context); g_object_notify_queue_freeze (object, &property_notify_context);
/* allow construct-only properties to be set */
G_LOCK (construct_objects_lock);
construct_objects = g_slist_prepend (construct_objects, object);
G_UNLOCK (construct_objects_lock);
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
IF_DEBUG (OBJECTS) IF_DEBUG (OBJECTS)
{ {
@ -818,6 +825,16 @@ g_object_new (GType object_type,
return object; return object;
} }
static gboolean
object_in_construction (GObject *object)
{
gboolean in_construction;
G_LOCK (construct_objects_lock);
in_construction = g_slist_find (construct_objects, object) != NULL;
G_UNLOCK (construct_objects_lock);
return in_construction;
}
gpointer gpointer
g_object_newv (GType object_type, g_object_newv (GType object_type,
guint n_parameters, guint n_parameters,
@ -922,6 +939,9 @@ g_object_newv (GType object_type,
/* construct object from construction parameters */ /* construct object from construction parameters */
object = class->constructor (object_type, n_total_cparams, cparams); object = class->constructor (object_type, n_total_cparams, cparams);
G_LOCK (construct_objects_lock);
construct_objects = g_slist_remove (construct_objects, object);
G_UNLOCK (construct_objects_lock);
/* free construction values */ /* free construction values */
g_free (cparams); g_free (cparams);
@ -1087,7 +1107,7 @@ g_object_set_valist (GObject *object,
G_OBJECT_TYPE_NAME (object)); G_OBJECT_TYPE_NAME (object));
break; break;
} }
if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) if ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) && !object_in_construction (object))
{ {
g_warning ("%s: construct property \"%s\" for object `%s' can't be set after construction", g_warning ("%s: construct property \"%s\" for object `%s' can't be set after construction",
G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object)); G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object));
@ -1235,7 +1255,7 @@ g_object_set_property (GObject *object,
G_STRFUNC, G_STRFUNC,
pspec->name, pspec->name,
G_OBJECT_TYPE_NAME (object)); G_OBJECT_TYPE_NAME (object));
else if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) else if ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) && !object_in_construction (object))
g_warning ("%s: construct property \"%s\" for object `%s' can't be set after construction", g_warning ("%s: construct property \"%s\" for object `%s' can't be set after construction",
G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object)); G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object));
else else