summaryrefslogtreecommitdiffstats
path: root/src/knot.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-07-27 11:44:25 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-07-27 11:44:25 +0000
commit3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af (patch)
tree981526f208f9998ea858cfd55a2c946f72dcb02e /src/knot.cpp
parentupdate to trunk (r13454) (diff)
parentProperly fix 1309050, revert incorrect fix for 601336 (diff)
downloadinkscape-3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af.tar.gz
inkscape-3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af.zip
update to trunk (r13472)
(bzr r13398.1.5)
Diffstat (limited to 'src/knot.cpp')
-rw-r--r--src/knot.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/knot.cpp b/src/knot.cpp
index 61d0dff39..2f8f55a2e 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -162,6 +162,9 @@ SPKnot::~SPKnot() {
g_free(this->tip);
this->tip = NULL;
}
+
+ // FIXME: cannot snap to destroyed knot (lp:1309050)
+ //sp_event_context_discard_delayed_snap_event(this->desktop->event_context);
}
void SPKnot::startDragging(Geom::Point const &p, gint x, gint y, guint32 etime) {
@@ -282,7 +285,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
knot->setFlag(SP_KNOT_DRAGGING, TRUE);
}
- sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, (gpointer) knot, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::KNOT_HANDLER);
+ sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, knot, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::KNOT_HANDLER);
sp_knot_handler_request_position(event, knot);
moved = TRUE;
}