[gimp] app: remove min-colors and install-colormap properties from gimprc

[Sven Neumann <neo src gnome org>]

commit 868fdcf99ff618130d835e1d681b498177eb3b2a
Author: Sven Neumann <sven gimp org>
Date:   Tue Oct 19 10:13:01 2010 +0200

    app: remove min-colors and install-colormap properties from gimprc

 app/config/gimpcoreconfig.c          |   52 +++++++++++++++++----------------
 app/config/gimpcoreconfig.h          |    2 -
 app/config/gimprc-blurbs.h           |    7 ----
 app/gui/gui.c                        |    3 --
 app/plug-in/gimppluginmanager-call.c |    4 +-
 5 files changed, 29 insertions(+), 39 deletions(-)
---
diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c
index 5ad13b5..bf1936a 100644
--- a/app/config/gimpcoreconfig.c
+++ b/app/config/gimpcoreconfig.c
@@ -94,12 +94,14 @@ enum
   PROP_LAYER_PREVIEW_SIZE,
   PROP_THUMBNAIL_SIZE,
   PROP_THUMBNAIL_FILESIZE_LIMIT,
-  PROP_INSTALL_COLORMAP,
-  PROP_MIN_COLORS,
   PROP_COLOR_MANAGEMENT,
   PROP_COLOR_PROFILE_POLICY,
   PROP_SAVE_DOCUMENT_HISTORY,
-  PROP_USE_GEGL
+  PROP_USE_GEGL,
+
+  /* ignored, only for backward compatibility: */
+  PROP_INSTALL_COLORMAP,
+  PROP_MIN_COLORS
 };
 
 
@@ -407,16 +409,6 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
                                     THUMBNAIL_FILESIZE_LIMIT_BLURB,
                                     0, GIMP_MAX_MEMSIZE, 1 << 22,
                                     GIMP_PARAM_STATIC_STRINGS);
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_INSTALL_COLORMAP,
-                                    "install-colormap", INSTALL_COLORMAP_BLURB,
-                                    FALSE,
-                                    GIMP_PARAM_STATIC_STRINGS |
-                                    GIMP_CONFIG_PARAM_RESTART);
-  GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_MIN_COLORS,
-                                "min-colors", MIN_COLORS_BLURB,
-                                27, 256, 144,
-                                GIMP_PARAM_STATIC_STRINGS |
-                                GIMP_CONFIG_PARAM_RESTART);
   GIMP_CONFIG_INSTALL_PROP_OBJECT (object_class, PROP_COLOR_MANAGEMENT,
                                    "color-management", COLOR_MANAGEMENT_BLURB,
                                    GIMP_TYPE_COLOR_CONFIG,
@@ -441,6 +433,18 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
                                                          FALSE,
                                                          GIMP_PARAM_READWRITE |
                                                          G_PARAM_CONSTRUCT));
+
+  /*  only for backward compatibility:  */
+  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_INSTALL_COLORMAP,
+                                    "install-colormap", NULL,
+                                    FALSE,
+                                    GIMP_PARAM_STATIC_STRINGS |
+                                    GIMP_CONFIG_PARAM_IGNORE);
+  GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_MIN_COLORS,
+                                "min-colors", NULL,
+                                27, 256, 144,
+                                GIMP_PARAM_STATIC_STRINGS |
+                                GIMP_CONFIG_PARAM_IGNORE);
 }
 
 static void
@@ -685,12 +689,6 @@ gimp_core_config_set_property (GObject      *object,
     case PROP_THUMBNAIL_FILESIZE_LIMIT:
       core_config->thumbnail_filesize_limit = g_value_get_uint64 (value);
       break;
-    case PROP_INSTALL_COLORMAP:
-      core_config->install_cmap = g_value_get_boolean (value);
-      break;
-    case PROP_MIN_COLORS:
-      core_config->min_colors = g_value_get_int (value);
-      break;
     case PROP_COLOR_MANAGEMENT:
       if (g_value_get_object (value))
         gimp_config_sync (g_value_get_object (value),
@@ -706,6 +704,11 @@ gimp_core_config_set_property (GObject      *object,
       core_config->use_gegl = g_value_get_boolean (value);
       break;
 
+    case PROP_INSTALL_COLORMAP:
+    case PROP_MIN_COLORS:
+      /*  ignored  */
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -854,12 +857,6 @@ gimp_core_config_get_property (GObject    *object,
     case PROP_THUMBNAIL_FILESIZE_LIMIT:
       g_value_set_uint64 (value, core_config->thumbnail_filesize_limit);
       break;
-    case PROP_INSTALL_COLORMAP:
-      g_value_set_boolean (value, core_config->install_cmap);
-      break;
-    case PROP_MIN_COLORS:
-      g_value_set_int (value, core_config->min_colors);
-      break;
     case PROP_COLOR_MANAGEMENT:
       g_value_set_object (value, core_config->color_management);
       break;
@@ -873,6 +870,11 @@ gimp_core_config_get_property (GObject    *object,
       g_value_set_boolean (value, core_config->use_gegl);
       break;
 
+    case PROP_INSTALL_COLORMAP:
+    case PROP_MIN_COLORS:
+      /*  ignored  */
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
diff --git a/app/config/gimpcoreconfig.h b/app/config/gimpcoreconfig.h
index 0a1f86a..77f8081 100644
--- a/app/config/gimpcoreconfig.h
+++ b/app/config/gimpcoreconfig.h
@@ -83,8 +83,6 @@ struct _GimpCoreConfig
   GimpViewSize            layer_preview_size;
   GimpThumbnailSize       thumbnail_size;
   guint64                 thumbnail_filesize_limit;
-  gboolean                install_cmap;
-  gint                    min_colors;
   GimpColorConfig        *color_management;
   GimpColorProfilePolicy  color_profile_policy;
   gboolean                save_document_history;
diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
index b8d11ca..796b4e8 100644
--- a/app/config/gimprc-blurbs.h
+++ b/app/config/gimprc-blurbs.h
@@ -197,9 +197,6 @@ N_("Sets the text to appear in image window titles.")
 N_("When enabled, this will ensure that the full image is visible after a " \
    "file is opened, otherwise it will be displayed with a scale of 1:1.")
 
-#define INSTALL_COLORMAP_BLURB \
-N_("Install a private colormap; might be useful on 8-bit (256 colors) displays.")
-
 #define INTERPOLATION_TYPE_BLURB \
 N_("Sets the level of interpolation used for scaling and other " \
    "transformations.")
@@ -221,10 +218,6 @@ N_("Speed of marching ants in the selection outline.  This value is in " \
 N_("GIMP will warn the user if an attempt is made to create an image that " \
    "would take more memory than the size specified here.")
 
-#define MIN_COLORS_BLURB  \
-N_("Generally only a concern for 8-bit displays, this sets the minimum " \
-   "number of system colors allocated for GIMP.")
-
 #define MODULE_PATH_BLURB \
 "Sets the module search path."
 
diff --git a/app/gui/gui.c b/app/gui/gui.c
index 73b59f5..c2e6da5 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -216,9 +216,6 @@ gui_init (Gimp     *gimp,
 
   themes_init (gimp);
 
-  gdk_rgb_set_min_colors (CLAMP (gimp->config->min_colors, 27, 256));
-  gdk_rgb_set_install (gimp->config->install_cmap);
-
   screen = gdk_screen_get_default ();
   gtk_widget_set_default_colormap (gdk_screen_get_rgb_colormap (screen));
 
diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c
index 71de9e3..99882cc 100644
--- a/app/plug-in/gimppluginmanager-call.c
+++ b/app/plug-in/gimppluginmanager-call.c
@@ -198,9 +198,9 @@ gimp_plug_in_manager_call_run (GimpPlugInManager   *manager,
       config.gimp_reserved_6  = 0;
       config.gimp_reserved_7  = 0;
       config.gimp_reserved_8  = 0;
-      config.install_cmap     = core_config->install_cmap;
+      config.install_cmap     = FALSE;
       config.show_tooltips    = gui_config->show_tooltips;
-      config.min_colors       = CLAMP (core_config->min_colors, 27, 256);
+      config.min_colors       = 144;
       config.gdisp_ID         = display_ID;
       config.app_name         = (gchar *) g_get_application_name ();
       config.wm_class         = (gchar *) gimp_get_program_class (manager->gimp);