diff options
| author | MenTaLguY <mental@rydia.net> | 2006-03-12 00:23:40 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2006-03-12 00:23:40 +0000 |
| commit | 000c6ff11f29d313617d64861f0f467c7d49cc4f (patch) | |
| tree | 82ce74d017aec9b93fda3656cbb94a23918a816b /src/sp-object.cpp | |
| parent | Changed color dragging to have a color preview. (diff) | |
| download | inkscape-000c6ff11f29d313617d64861f0f467c7d49cc4f.tar.gz inkscape-000c6ff11f29d313617d64861f0f467c7d49cc4f.zip | |
experiment with moving release beofre extraction of object from document tree
(bzr r222)
Diffstat (limited to 'src/sp-object.cpp')
| -rw-r--r-- | src/sp-object.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp index fd368dd61..5f6bf779f 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -659,6 +659,8 @@ sp_object_detach(SPObject *parent, SPObject *object) { g_return_if_fail(SP_IS_OBJECT(object)); g_return_if_fail(object->parent == parent); + sp_object_invoke_release(object); + SPObject *prev=NULL; for ( SPObject *child = parent->children ; child && child != object ; child = child->next ) @@ -679,7 +681,6 @@ sp_object_detach(SPObject *parent, SPObject *object) { object->next = NULL; object->parent = NULL; - sp_object_invoke_release(object); parent->_updateTotalHRefCount(-object->_total_hrefcount); sp_object_unref(object, parent); } @@ -870,9 +871,6 @@ sp_object_invoke_release(SPObject *object) g_assert(object != NULL); g_assert(SP_IS_OBJECT(object)); - // we need to remember our parent - // g_assert(!object->parent); - g_assert(!object->next); g_assert(object->document); g_assert(object->repr); |