Merge from trunk

(bzr r9508.1.73)

1 files changed, 2 insertions, 2 deletions

diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp
index 9163d1c91..573c8a2fd 100644
--- a/src/live_effects/lpeobject-reference.cpp
+++ b/src/live_effects/lpeobject-reference.cpp
@@ -45,7 +45,7 @@ bool LPEObjectReference::_acceptObject(SPObject * const obj) const
     if (IS_LIVEPATHEFFECT(obj)) {
         SPObject * const owner = getOwner();
         /* Refuse references to us or to an ancestor. */
-        for ( SPObject *iter = owner ; iter ; iter = SP_OBJECT_PARENT(iter) ) {
+        for ( SPObject *iter = owner ; iter ; iter = iter->parent ) {
             if ( iter == obj ) {
                 return false;
             }
@@ -94,7 +94,7 @@ LPEObjectReference::start_listening(LivePathEffectObject* to)
         return;
     }
     lpeobject = to;
-    lpeobject_repr = SP_OBJECT_REPR(to);
+    lpeobject_repr = to->getRepr();
     _delete_connection = to->connectDelete(sigc::bind(sigc::ptr_fun(&lpeobjectreference_delete_self), this));
     _modified_connection = to->connectModified(sigc::bind<2>(sigc::ptr_fun(&lpeobjectreference_source_modified), this));
 }