From d36da3ec31ec1db718b4b990ae5acdb3d9a919e5 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Sat, 30 Aug 2008 19:27:32 +0000
Subject: Eliminate SP_ACTIVE_DESKTOP in the object-snapper

(bzr r6730)
---
 src/snap.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index 15bc8658d..54eb500e1 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -886,7 +886,8 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(Geom::Point const &p, SnappedCo
 void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, SPItem const *item_to_ignore, std::vector<Geom::Point> *unselected_nodes)
 {
     g_assert(desktop != NULL);
-	_item_to_ignore = item_to_ignore;
+	object.setDesktop(desktop);
+    _item_to_ignore = item_to_ignore;
     _items_to_ignore = NULL;
     _desktop = desktop;
     _snapindicator = snapindicator;
@@ -896,6 +897,7 @@ void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, SPItem con
 void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<Geom::Point> *unselected_nodes)
 {
 	g_assert(desktop != NULL);
+	object.setDesktop(desktop);
 	_item_to_ignore = NULL;
     _items_to_ignore = &items_to_ignore;
     _desktop = desktop;
-- 
cgit v1.2.3