Commit f666fe0f authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/config/gimpbaseconfig.c reverted parts of commit 25812. Restores

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.


svn path=/trunk/; revision=27086
parent 24b2c1c9
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.
2008-09-30 Sven Neumann <sven@gimp.org>
* app/config/gimprc-deserialize.c (gimp_rc_deserialize): formatting.
......
......@@ -48,7 +48,10 @@ enum
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 @@ gimp_base_config_class_init (GimpBaseConfigClass *klass)
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 @@ gimp_base_config_set_property (GObject *object,
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 @@ gimp_base_config_get_property (GObject *object,
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;
......
......@@ -83,7 +83,12 @@ enum
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_gui_config_class_init (GimpGuiConfigClass *klass)
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 @@ gimp_gui_config_set_property (GObject *object,
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 @@ gimp_gui_config_get_property (GObject *object,
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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment