[gimp] app: move "default-threshold" from GimpGuiConfig to GimpCoreConfig

[Michael Natterer <mitch src gnome org>]

commit f76bcab2216ea26f14f8eb6a919312bcbf3e5cb8
Author: Michael Natterer <mitch gimp org>
Date:   Fri Feb 4 15:19:44 2011 +0100

    app: move "default-threshold" from GimpGuiConfig to GimpCoreConfig

 app/config/gimpcoreconfig.c         |   11 +++++++++++
 app/config/gimpcoreconfig.h         |    1 +
 app/config/gimpguiconfig.c          |   11 -----------
 app/config/gimpguiconfig.h          |    1 -
 app/tools/gimpbucketfilloptions.c   |    4 ++--
 app/tools/gimpregionselectoptions.c |    4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c
index bf1936a..200b0c4 100644
--- a/app/config/gimpcoreconfig.c
+++ b/app/config/gimpcoreconfig.c
@@ -52,6 +52,7 @@ enum
   PROP_0,
   PROP_LANGUAGE,
   PROP_INTERPOLATION_TYPE,
+  PROP_DEFAULT_THRESHOLD,
   PROP_PLUG_IN_PATH,
   PROP_MODULE_PATH,
   PROP_INTERPRETER_PATH,
@@ -151,6 +152,10 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
                                  GIMP_TYPE_INTERPOLATION_TYPE,
                                  GIMP_INTERPOLATION_CUBIC,
                                  GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_DEFAULT_THRESHOLD,
+                                "default-threshold", DEFAULT_THRESHOLD_BLURB,
+                                0, 255, 15,
+                                GIMP_PARAM_STATIC_STRINGS);
 
   path = gimp_config_build_plug_in_path ("plug-ins");
   GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PLUG_IN_PATH,
@@ -533,6 +538,9 @@ gimp_core_config_set_property (GObject      *object,
     case PROP_INTERPOLATION_TYPE:
       core_config->interpolation_type = g_value_get_enum (value);
       break;
+    case PROP_DEFAULT_THRESHOLD:
+      core_config->default_threshold = g_value_get_int (value);
+      break;
     case PROP_PLUG_IN_PATH:
       g_free (core_config->plug_in_path);
       core_config->plug_in_path = g_value_dup_string (value);
@@ -731,6 +739,9 @@ gimp_core_config_get_property (GObject    *object,
     case PROP_INTERPOLATION_TYPE:
       g_value_set_enum (value, core_config->interpolation_type);
       break;
+    case PROP_DEFAULT_THRESHOLD:
+      g_value_set_int (value, core_config->default_threshold);
+      break;
     case PROP_PLUG_IN_PATH:
       g_value_set_string (value, core_config->plug_in_path);
       break;
diff --git a/app/config/gimpcoreconfig.h b/app/config/gimpcoreconfig.h
index 77f8081..3502e9c 100644
--- a/app/config/gimpcoreconfig.h
+++ b/app/config/gimpcoreconfig.h
@@ -41,6 +41,7 @@ struct _GimpCoreConfig
 
   gchar                  *language;
   GimpInterpolationType   interpolation_type;
+  gint                    default_threshold;
   gchar                  *plug_in_path;
   gchar                  *module_path;
   gchar                  *interpreter_path;
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index d69aef2..56f5a13 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -43,7 +43,6 @@
 enum
 {
   PROP_0,
-  PROP_DEFAULT_THRESHOLD,
   PROP_MOVE_TOOL_CHANGES_ACTIVE,
   PROP_IMAGE_MAP_TOOL_MAX_RECENT,
   PROP_TRUST_DIRTY_FLAG,
@@ -112,10 +111,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
   object_class->set_property = gimp_gui_config_set_property;
   object_class->get_property = gimp_gui_config_get_property;
 
-  GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_DEFAULT_THRESHOLD,
-                                "default-threshold", DEFAULT_THRESHOLD_BLURB,
-                                0, 255, 15,
-                                GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_MOVE_TOOL_CHANGES_ACTIVE,
                                     "move-tool-changes-active",
                                     MOVE_TOOL_CHANGES_ACTIVE_BLURB,
@@ -332,9 +327,6 @@ gimp_gui_config_set_property (GObject      *object,
 
   switch (property_id)
     {
-    case PROP_DEFAULT_THRESHOLD:
-      gui_config->default_threshold = g_value_get_int (value);
-      break;
     case PROP_MOVE_TOOL_CHANGES_ACTIVE:
       gui_config->move_tool_changes_active = g_value_get_boolean (value);
       break;
@@ -456,9 +448,6 @@ gimp_gui_config_get_property (GObject    *object,
 
   switch (property_id)
     {
-    case PROP_DEFAULT_THRESHOLD:
-      g_value_set_int (value, gui_config->default_threshold);
-      break;
     case PROP_MOVE_TOOL_CHANGES_ACTIVE:
       g_value_set_boolean (value, gui_config->move_tool_changes_active);
       break;
diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
index 5126c65..b3efbe3 100644
--- a/app/config/gimpguiconfig.h
+++ b/app/config/gimpguiconfig.h
@@ -37,7 +37,6 @@ struct _GimpGuiConfig
 {
   GimpDisplayConfig    parent_instance;
 
-  gint                 default_threshold;
   gboolean             move_tool_changes_active;
   gint                 image_map_tool_max_recent;
   gboolean             trust_dirty_flag;
diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c
index b2e4429..5422637 100644
--- a/app/tools/gimpbucketfilloptions.c
+++ b/app/tools/gimpbucketfilloptions.c
@@ -24,7 +24,7 @@
 
 #include "tools-types.h"
 
-#include "config/gimpguiconfig.h"
+#include "config/gimpcoreconfig.h"
 
 #include "core/gimp.h"
 #include "core/gimpdatafactory.h"
@@ -204,7 +204,7 @@ gimp_bucket_fill_options_reset (GimpToolOptions *tool_options)
 
   if (pspec)
     G_PARAM_SPEC_DOUBLE (pspec)->default_value =
-      GIMP_GUI_CONFIG (tool_options->tool_info->gimp->config)->default_threshold;
+      tool_options->tool_info->gimp->config->default_threshold;
 
   GIMP_TOOL_OPTIONS_CLASS (parent_class)->reset (tool_options);
 }
diff --git a/app/tools/gimpregionselectoptions.c b/app/tools/gimpregionselectoptions.c
index 7ed62fa..74f97fc 100644
--- a/app/tools/gimpregionselectoptions.c
+++ b/app/tools/gimpregionselectoptions.c
@@ -24,7 +24,7 @@
 
 #include "tools-types.h"
 
-#include "config/gimpguiconfig.h"
+#include "config/gimpcoreconfig.h"
 
 #include "core/gimp.h"
 #include "core/gimptoolinfo.h"
@@ -182,7 +182,7 @@ gimp_region_select_options_reset (GimpToolOptions *tool_options)
 
   if (pspec)
     G_PARAM_SPEC_DOUBLE (pspec)->default_value =
-      GIMP_GUI_CONFIG (tool_options->tool_info->gimp->config)->default_threshold;
+      tool_options->tool_info->gimp->config->default_threshold;
 
   GIMP_TOOL_OPTIONS_CLASS (parent_class)->reset (tool_options);
 }