From d2eab659b08ba4a28410ed2527ba0431832776b3 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Mon, 18 Aug 2008 00:33:13 +0000 Subject: Remove done_pathparam_set and friends because it currently isn't used any more anyway; reimplement its intended functionality by using isReady() (bzr r6643) --- src/pen-context.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/pen-context.cpp') diff --git a/src/pen-context.cpp b/src/pen-context.cpp index 3cc7cc0d6..8e1f6947b 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -152,6 +152,7 @@ sp_pen_context_init(SPPenContext *pc) pc->num_clicks = 0; pc->waiting_LPE = NULL; + pc->waiting_item = NULL; } /** @@ -564,7 +565,7 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const } } - if (pc->expecting_clicks_for_LPE) { + if (pc->expecting_clicks_for_LPE > 0) { --pc->expecting_clicks_for_LPE; } @@ -1383,10 +1384,12 @@ sp_pen_context_wait_for_LPE_mouse_clicks(SPPenContext *pc, Inkscape::LivePathEff { g_print ("Now waiting for %s to be applied\n", Inkscape::LivePathEffect::LPETypeConverter.get_label(effect_type).c_str()); + g_return_if_fail(effect_type != Inkscape::LivePathEffect::INVALID_LPE); + + pc->waiting_LPE_type = effect_type; pc->expecting_clicks_for_LPE = num_clicks; pc->polylines_only = use_polylines; pc->polylines_paraxial = false; // TODO: think if this is correct for all cases - pc->waiting_LPE_type = effect_type; } static int pen_next_paraxial_direction(const SPPenContext *const pc, -- cgit v1.2.3