[gimp] app: fiddle less with GimpFilterTool internals in GimpOperationTool



commit 787f645c57ea336629830ab4dfb76849d5846ec6
Author: Michael Natterer <mitch gimp org>
Date:   Wed Jul 5 20:54:21 2017 +0200

    app: fiddle less with GimpFilterTool internals in GimpOperationTool
    
    Use gimp_filter_tool_disable_color_picking() in
    gimp_operation_tool_set_operation() instead of poking around manually.

 app/tools/gimpoperationtool.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c
index e2664fe..5e580b2 100644
--- a/app/tools/gimpoperationtool.c
+++ b/app/tools/gimpoperationtool.c
@@ -645,14 +645,9 @@ gimp_operation_tool_set_operation (GimpOperationTool *tool,
 
   if (tool->options_gui)
     {
-      gtk_widget_destroy (tool->options_gui);
-      tool->options_gui = NULL;
+      gimp_filter_tool_disable_color_picking (filter_tool);
 
-      if (filter_tool->active_picker)
-        {
-          filter_tool->active_picker = NULL;
-          gimp_color_tool_disable (GIMP_COLOR_TOOL (tool));
-        }
+      gtk_widget_destroy (tool->options_gui);
     }
 
   if (! operation)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]