gimp r27086 - in trunk: . app/config

[neo svn gnome org]

Author: neo
Date: Tue Sep 30 09:41:55 2008
New Revision: 27086
URL: http://svn.gnome.org/viewvc/gimp?rev=27086&view=rev

Log:
2008-09-30  Sven Neumann  <sven gimp org>

	* app/config/gimpbaseconfig.c
	* app/config/gimpguiconfig.c: reverted parts of commit 25812.
	Restores compatibility with old gimprc files.



Modified:
   trunk/ChangeLog
   trunk/app/config/gimpbaseconfig.c
   trunk/app/config/gimpguiconfig.c

Modified: trunk/app/config/gimpbaseconfig.c
==============================================================================
--- trunk/app/config/gimpbaseconfig.c	(original)
+++ trunk/app/config/gimpbaseconfig.c	Tue Sep 30 09:41:55 2008
@@ -48,7 +48,10 @@
   PROP_TEMP_PATH,
   PROP_SWAP_PATH,
   PROP_NUM_PROCESSORS,
-  PROP_TILE_CACHE_SIZE
+  PROP_TILE_CACHE_SIZE,
+
+  /* ignored, only for backward compatibility: */
+  PROP_STINGY_MEMORY_USE
 };
 
 
@@ -107,6 +110,12 @@
                                     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
@@ -150,6 +159,10 @@
       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;
@@ -179,6 +192,10 @@
       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	Tue Sep 30 09:41:55 2008
@@ -83,7 +83,12 @@
   PROP_TOOLBOX_WINDOW_HINT,
   PROP_DOCK_WINDOW_HINT,
   PROP_TRANSIENT_DOCKS,
-  PROP_CURSOR_FORMAT
+  PROP_CURSOR_FORMAT,
+
+  /* ignored, only for backward compatibility: */
+  PROP_INFO_WINDOW_PER_DISPLAY,
+  PROP_SHOW_TOOL_TIPS,
+  PROP_SHOW_TIPS
 };
 
 
@@ -268,6 +273,24 @@
                                  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
@@ -401,6 +424,12 @@
       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;
@@ -514,6 +543,12 @@
       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;