callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove concept of root objects and just refcount all objects in the

Browse Source 
2006-11-26  Ryan Lortie  <desrt@desrt.ca>

        * gtkbuilder.c: remove concept of root objects and just refcount
        all objects in the builder.  Fixes #496651.


svn path=/trunk/; revision=19074
This commit is contained in:
Ryan Lortie
2007-11-27 03:07:23 +00:00
committed by Ryan Lortie
parent 029de426da
commit 490af125c2
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-11-26 Ryan Lortie <desrt@desrt.ca>
* gtkbuilder.c: remove concept of root objects and just refcount
all objects in the builder. Fixes #496651.
2007-11-26 Ryan Lortie <desrt@desrt.ca> 2007-11-26 Ryan Lortie <desrt@desrt.ca>
* tests/buildertest.c (test_window): fix invalid free * tests/buildertest.c (test_window): fix invalid free

31
gtk/gtkbuilder.c
View File

@ -67,7 +67,6 @@ struct _GtkBuilderPrivate
GHashTable *objects; GHashTable *objects;
GSList *delayed_properties; GSList *delayed_properties;
GSList *signals; GSList *signals;
GSList *root_objects;
gchar *filename; gchar *filename;
}; };
@ -114,7 +113,7 @@ gtk_builder_init (GtkBuilder *builder)
GtkBuilderPrivate); GtkBuilderPrivate);
builder->priv->domain = NULL; builder->priv->domain = NULL;
builder->priv->objects = g_hash_table_new_full (g_str_hash, g_str_equal, builder->priv->objects = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, NULL); g_free, g_object_unref);
} }
@ -135,9 +134,6 @@ gtk_builder_finalize (GObject *object)
g_slist_foreach (priv->signals, (GFunc) _free_signal_info, NULL); g_slist_foreach (priv->signals, (GFunc) _free_signal_info, NULL);
g_slist_free (priv->signals); g_slist_free (priv->signals);
g_slist_foreach (priv->root_objects, (GFunc) g_object_unref, NULL);
g_slist_free (priv->root_objects);
G_OBJECT_CLASS (gtk_builder_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_builder_parent_class)->finalize (object);
} }
@ -406,7 +402,7 @@ _gtk_builder_construct (GtkBuilder *builder,
g_assert (obj != NULL); g_assert (obj != NULL);
if (construct_parameters->len) if (construct_parameters->len)
g_warning ("Can't pass in construct-only parameters to %s", info->id); g_warning ("Can't pass in construct-only parameters to %s", info->id);
g_object_ref (obj);
} }
else if (info->parent && ((ChildInfo*)info->parent)->internal_child != NULL) else if (info->parent && ((ChildInfo*)info->parent)->internal_child != NULL)
{ {
@ -414,6 +410,7 @@ _gtk_builder_construct (GtkBuilder *builder,
obj = gtk_builder_get_internal_child (builder, info, childname); obj = gtk_builder_get_internal_child (builder, info, childname);
if (construct_parameters->len) if (construct_parameters->len)
g_warning ("Can't pass in construct-only parameters to %s", childname); g_warning ("Can't pass in construct-only parameters to %s", childname);
g_object_ref (obj);
} }
else else
{ {
@ -421,6 +418,18 @@ _gtk_builder_construct (GtkBuilder *builder,
construct_parameters->len, construct_parameters->len,
(GParameter *)construct_parameters->data); (GParameter *)construct_parameters->data);
/* No matter what, make sure we have a reference.
*
* If it's an initially unowned object, sink it.
* If it's not initially unowned then we have the reference already.
*
* In the case that this is a window it will be sunk already and
* this is effectively a call to g_object_ref(). That's what
* we want.
*/
if (G_IS_INITIALLY_UNOWNED (obj))
g_object_ref_sink (obj);
GTK_NOTE (BUILDER, GTK_NOTE (BUILDER,
g_print ("created %s of type %s\n", info->id, info->class_name)); g_print ("created %s of type %s\n", info->id, info->class_name));
@ -472,15 +481,7 @@ _gtk_builder_construct (GtkBuilder *builder,
g_strdup (info->id), g_strdup (info->id),
g_free); g_free);
/* we already own a reference to obj. put it in the hash table. */
if (!info->parent && !GTK_IS_WINDOW (obj))
{
if (g_object_is_floating (obj))
g_object_ref_sink (obj);
builder->priv->root_objects =
g_slist_prepend (builder->priv->root_objects, obj);
}
g_hash_table_insert (builder->priv->objects, g_strdup (info->id), obj); g_hash_table_insert (builder->priv->objects, g_strdup (info->id), obj);
return obj; return obj;