[gimp] app: make sure the warp tool halts when the drawable is changed

[Michael Natterer <mitch src gnome org>]

commit 6f17eb54a1f8593e44a5ff7e6d9764da8e2f61a1
Author: Michael Natterer <mitch gimp org>
Date:   Tue Jun 4 10:16:32 2013 +0200

    app: make sure the warp tool halts when the drawable is changed
    
    Set preserve=FALSE by default, also don't set preserve=TRUE around
    aborting the image map, that's not needed any longer because image map
    has stopped to be a temporarily destructive thing.

 app/tools/gimpwarptool.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c
index 9380088..4d14446 100644
--- a/app/tools/gimpwarptool.c
+++ b/app/tools/gimpwarptool.c
@@ -160,6 +160,7 @@ gimp_warp_tool_init (GimpWarpTool *self)
 {
   GimpTool *tool = GIMP_TOOL (self);
 
+  gimp_tool_control_set_preserve    (tool->control, FALSE);
   gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
   gimp_tool_control_set_dirty_mask  (tool->control,
                                      GIMP_DIRTY_IMAGE           |
@@ -564,14 +565,10 @@ gimp_warp_tool_halt (GimpWarpTool *wt)
 
   if (wt->image_map)
     {
-      gimp_tool_control_set_preserve (tool->control, TRUE);
-
       gimp_image_map_abort (wt->image_map);
       g_object_unref (wt->image_map);
       wt->image_map = NULL;
 
-      gimp_tool_control_set_preserve (tool->control, FALSE);
-
       gimp_image_flush (gimp_display_get_image (tool->display));
     }