diff options
| author | bulia byak <buliabyak@gmail.com> | 2008-07-19 04:35:04 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2008-07-19 04:35:04 +0000 |
| commit | fcd190bd33c0f4bf57ff69bc7bacc7c10de81b07 (patch) | |
| tree | 9f3e07981716f0b256d69254e221c5fa64ffc1e0 /src | |
| parent | fix crash when simplifying an lpe path: deleting the list didn't release the ... (diff) | |
| download | inkscape-fcd190bd33c0f4bf57ff69bc7bacc7c10de81b07.tar.gz inkscape-fcd190bd33c0f4bf57ff69bc7bacc7c10de81b07.zip | |
remove usereference vestiges, change the signature of user_unlink (not used yet)
(bzr r6359)
Diffstat (limited to 'src')
| -rw-r--r-- | src/live_effects/lpeobject-reference.cpp | 9 | ||||
| -rw-r--r-- | src/live_effects/lpeobject-reference.h | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp index 8a8dd94da..f522ae56e 100644 --- a/src/live_effects/lpeobject-reference.cpp +++ b/src/live_effects/lpeobject-reference.cpp @@ -128,17 +128,10 @@ lpeobjectreference_href_changed(SPObject */*old_ref*/, SPObject */*ref*/, LPEObj static void lpeobjectreference_delete_self(SPObject */*deleted*/, LPEObjectReference *lpeobjref) { - guint const mode = prefs_get_int_attribute("options.cloneorphans", "value", SP_CLONE_ORPHANS_UNLINK); - - if (mode == SP_CLONE_ORPHANS_UNLINK) { - // leave it be. just forget about the source lpeobjref->quit_listening(); lpeobjref->unlink(); if (lpeobjref->user_unlink) - lpeobjref->user_unlink(lpeobjref->owner); - } else if (mode == SP_CLONE_ORPHANS_DELETE) { - lpeobjref->owner->deleteObject(); - } + lpeobjref->user_unlink(lpeobjref, lpeobjref->owner); } static void diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h index e5f7556f1..48d7eb3a5 100644 --- a/src/live_effects/lpeobject-reference.h +++ b/src/live_effects/lpeobject-reference.h @@ -46,7 +46,7 @@ public: void start_listening(LivePathEffectObject* to); void quit_listening(void); - void (*user_unlink) (SPObject *user); + void (*user_unlink) (LPEObjectReference *me, SPObject *user); protected: bool _acceptObject(SPObject * const obj) const; |