gimp r25812 - in trunk: . app/config app/tools

[mitch svn gnome org]

Author: mitch
Date: Mon May 26 17:47:28 2008
New Revision: 25812
URL: http://svn.gnome.org/viewvc/gimp?rev=25812&view=rev

Log:
2008-05-26  Michael Natterer  <mitch gimp org>

	* app/config/gimpbaseconfig.c
	* app/config/gimpguiconfig.c
	* app/tools/gimpcolorpickeroptions.[ch]: remove unused compat
	properties because the config parser silently skips unknown
	properties now.



Modified:
   trunk/ChangeLog
   trunk/app/config/gimpbaseconfig.c
   trunk/app/config/gimpguiconfig.c
   trunk/app/tools/gimpcolorpickeroptions.c
   trunk/app/tools/gimpcolorpickeroptions.h

Modified: trunk/app/config/gimpbaseconfig.c
==============================================================================
--- trunk/app/config/gimpbaseconfig.c	(original)
+++ trunk/app/config/gimpbaseconfig.c	Mon May 26 17:47:28 2008
@@ -48,10 +48,7 @@
   PROP_TEMP_PATH,
   PROP_SWAP_PATH,
   PROP_NUM_PROCESSORS,
-  PROP_TILE_CACHE_SIZE,
-
-  /* ignored, only for backward compatibility: */
-  PROP_STINGY_MEMORY_USE
+  PROP_TILE_CACHE_SIZE
 };
 
 
@@ -110,12 +107,6 @@
                                     1 << 30, /* 1GB */
                                     GIMP_PARAM_STATIC_STRINGS |
                                     GIMP_CONFIG_PARAM_CONFIRM);
-
-  /*  only for backward compatibility:  */
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_STINGY_MEMORY_USE,
-                                    "stingy-memory-use", NULL,
-                                    FALSE,
-                                    GIMP_CONFIG_PARAM_IGNORE);
 }
 
 static void
@@ -159,10 +150,6 @@
       base_config->tile_cache_size = g_value_get_uint64 (value);
       break;
 
-    case PROP_STINGY_MEMORY_USE:
-      /* ignored */
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -192,10 +179,6 @@
       g_value_set_uint64 (value, base_config->tile_cache_size);
       break;
 
-    case PROP_STINGY_MEMORY_USE:
-      /* ignored */
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;

Modified: trunk/app/config/gimpguiconfig.c
==============================================================================
--- trunk/app/config/gimpguiconfig.c	(original)
+++ trunk/app/config/gimpguiconfig.c	Mon May 26 17:47:28 2008
@@ -77,12 +77,7 @@
   PROP_TOOLBOX_WINDOW_HINT,
   PROP_DOCK_WINDOW_HINT,
   PROP_TRANSIENT_DOCKS,
-  PROP_CURSOR_FORMAT,
-
-  /* ignored, only for backward compatibility: */
-  PROP_INFO_WINDOW_PER_DISPLAY,
-  PROP_SHOW_TOOL_TIPS,
-  PROP_SHOW_TIPS
+  PROP_CURSOR_FORMAT
 };
 
 
@@ -252,24 +247,6 @@
                                  GIMP_TYPE_CURSOR_FORMAT,
                                  GIMP_CURSOR_FORMAT_PIXBUF,
                                  GIMP_PARAM_STATIC_STRINGS);
-
-  /*  only for backward compatibility:  */
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_INFO_WINDOW_PER_DISPLAY,
-                                    "info-window-per-display",
-                                    NULL,
-                                    FALSE,
-                                    GIMP_PARAM_STATIC_STRINGS |
-                                    GIMP_CONFIG_PARAM_IGNORE);
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_TOOL_TIPS,
-                                    "show-tool-tips", NULL,
-                                    FALSE,
-                                    GIMP_PARAM_STATIC_STRINGS |
-                                    GIMP_CONFIG_PARAM_IGNORE);
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_TIPS,
-                                    "show-tips", NULL,
-                                    FALSE,
-                                    GIMP_PARAM_STATIC_STRINGS |
-                                    GIMP_CONFIG_PARAM_IGNORE);
 }
 
 static void
@@ -392,12 +369,6 @@
       gui_config->cursor_format = g_value_get_enum (value);
       break;
 
-    case PROP_INFO_WINDOW_PER_DISPLAY:
-    case PROP_SHOW_TOOL_TIPS:
-    case PROP_SHOW_TIPS:
-      /* ignored */
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -502,12 +473,6 @@
       g_value_set_enum (value, gui_config->cursor_format);
       break;
 
-    case PROP_INFO_WINDOW_PER_DISPLAY:
-    case PROP_SHOW_TOOL_TIPS:
-    case PROP_SHOW_TIPS:
-      /* ignored */
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;

Modified: trunk/app/tools/gimpcolorpickeroptions.c
==============================================================================
--- trunk/app/tools/gimpcolorpickeroptions.c	(original)
+++ trunk/app/tools/gimpcolorpickeroptions.c	Mon May 26 17:47:28 2008
@@ -37,7 +37,6 @@
   PROP_0,
   PROP_SAMPLE_AVERAGE, /* overrides a GimpColorOptions property */
   PROP_PICK_MODE,
-  PROP_ADD_TO_PALETTE,
   PROP_USE_INFO_WINDOW
 };
 
@@ -74,10 +73,6 @@
                                  GIMP_TYPE_COLOR_PICK_MODE,
                                  GIMP_COLOR_PICK_MODE_FOREGROUND,
                                  GIMP_PARAM_STATIC_STRINGS);
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ADD_TO_PALETTE,
-                                    "add-to-palette", NULL,
-                                    FALSE,
-                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_USE_INFO_WINDOW,
                                     "use-info-window", NULL,
                                     FALSE,
@@ -105,12 +100,10 @@
     case PROP_PICK_MODE:
       options->pick_mode = g_value_get_enum (value);
       break;
-    case PROP_ADD_TO_PALETTE:
-      options->add_to_palette = g_value_get_boolean (value);
-      break;
     case PROP_USE_INFO_WINDOW:
       options->use_info_window = g_value_get_boolean (value);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -134,12 +127,10 @@
     case PROP_PICK_MODE:
       g_value_set_enum (value, options->pick_mode);
       break;
-    case PROP_ADD_TO_PALETTE:
-      g_value_set_boolean (value, options->add_to_palette);
-      break;
     case PROP_USE_INFO_WINDOW:
       g_value_set_boolean (value, options->use_info_window);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;

Modified: trunk/app/tools/gimpcolorpickeroptions.h
==============================================================================
--- trunk/app/tools/gimpcolorpickeroptions.h	(original)
+++ trunk/app/tools/gimpcolorpickeroptions.h	Mon May 26 17:47:28 2008
@@ -39,7 +39,6 @@
   GimpColorOptions   parent_instance;
 
   GimpColorPickMode  pick_mode;
-  gboolean           add_to_palette; /* unused */
   gboolean           use_info_window;
 };