diff --git a/src/knot.cpp b/src/knot.cpp
index 1584769b4613b98669e1f24da01f8d759f2cfe83..cf1a3e9444e8194d15a97b9c16a6b8973b5cbfaf 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
#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,10 +379,10 @@ 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);
+ knot->desktop->scroll_to_point (motion_dt);
knot->desktop->set_coordinate_status(knot->pos); // display the coordinate of knot, not cursor - they may be different!
if (event->motion.state & GDK_BUTTON1_MASK)
gobble_motion_events(GDK_BUTTON1_MASK);