add accessor for the waiting_cursor flag (sorry for the recompile)

[inkscape.git] / src / knot.cpp

diff --git a/src/knot.cpp b/src/knot.cpp
index 59e32a56ecefc48dec723bf3bcb429c8139fa3be..cf1a3e9444e8194d15a97b9c16a6b8973b5cbfaf 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -24,7 +24,7 @@
 #include "desktop-handles.h"
 #include "knot.h"
 #include "document.h"
-#include "prefs-utils.h"
+#include "preferences.h"
 #include "message-stack.h"
 #include "message-context.h"
 #include "event-context.h"
@@ -299,7 +299,8 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
     }
 
     g_object_ref(knot);
-    tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
 
     switch (event->type) {
        case GDK_2BUTTON_PRESS:
@@ -378,7 +379,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
                                      TRUE);
                 }
                 Geom::Point const motion_w(event->motion.x, event->motion.y);
-                NR::Point const motion_dt = knot->desktop->w2d(motion_w);
+                Geom::Point const motion_dt = knot->desktop->w2d(motion_w);
                 Geom::Point p = motion_dt - knot->grabbed_rel_pos;
                 sp_knot_request_position (knot, p, event->motion.state);
                 knot->desktop->scroll_to_point (motion_dt);