diff options
-rw-r--r-- | camel/ChangeLog | 6 | ||||
-rw-r--r-- | camel/camel-object.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 070ce611d5..8f87491d3d 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-08-28 Peter Williams <peterw@ximian.com> + + * camel-object.c (camel_object_unref): Make the locking more + fine-grained on destruction; specifically, don't hold the + type lock while calling the finalize functions. + 2001-08-27 Jeffrey Stedfast <fejj@ximian.com> * providers/local/camel-local-provider.c: Changed the diff --git a/camel/camel-object.c b/camel/camel-object.c index 703503b15b..ed8c255eaf 100644 --- a/camel/camel-object.c +++ b/camel/camel-object.c @@ -529,6 +529,10 @@ camel_object_unref (CamelObject * obj) GINT_TO_POINTER (iter->parent)); } + /* ok, done with the type stuff, and our data pointers + * won't go bad. */ + camel_type_lock_down (); + parents = g_slist_reverse (parents); head = parents; @@ -562,6 +566,8 @@ camel_object_unref (CamelObject * obj) /* Tuck away the pointer for use in a new object */ + camel_type_lock_up (); + type_info->free_instances = g_list_prepend (type_info->free_instances, obj); |