remove usereference vestiges, change the signature of user_unlink (not used yet)

diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp
index 8a8dd94da0c18381263c8b053ddec28ece2b6845..f522ae56ed8b1424c1c54640fae74136740b95ba 100644 (file)
--- 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 e5f7556f1668d138b899344c475c0ffc715caa07..48d7eb3a5742725722f0c2057319c623abc92506 100644 (file)
--- 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;