diff --git a/app/core/gimp-user-install.c b/app/core/gimp-user-install.c index a6272a69e7..d4d1b98d37 100644 --- a/app/core/gimp-user-install.c +++ b/app/core/gimp-user-install.c @@ -1073,9 +1073,10 @@ user_update_tool_presets (const GMatchInfo *matched_value, * well as "toolrc" (but this one is skipped anyway). */ #define CONTEXTRC_UPDATE_PATTERN \ - "gimp-blend-tool" "|" \ - "dynamics \"Dynamics Off\"" "|" \ - "\\(dynamics-expanded yes\\)" + "gimp-blend-tool" "|" \ + "dynamics \"Dynamics Off\"" "|" \ + "\\(dynamics-expanded yes\\)" "|" \ + "\\(color-options-expanded [^)]*\\)" static gboolean user_update_contextrc_over20 (const GMatchInfo *matched_value, @@ -1096,6 +1097,10 @@ user_update_contextrc_over20 (const GMatchInfo *matched_value, { /* This option just doesn't exist anymore. */ } + else if (g_str_has_prefix (match, "(color-options-expanded ")) + { + /* This option was removed with the gamma-hack. Cf. #12577. */ + } else { g_message ("(WARNING) %s: invalid match \"%s\"", G_STRFUNC, match); diff --git a/app/tools/gimpfilteroptions.c b/app/tools/gimpfilteroptions.c index 8f74366586..acf37e938e 100644 --- a/app/tools/gimpfilteroptions.c +++ b/app/tools/gimpfilteroptions.c @@ -39,7 +39,6 @@ enum PROP_PREVIEW_SPLIT_POSITION, PROP_CONTROLLER, PROP_BLENDING_OPTIONS_EXPANDED, - PROP_COLOR_OPTIONS_EXPANDED, PROP_MERGE_FILTER }; @@ -111,12 +110,6 @@ gimp_filter_options_class_init (GimpFilterOptionsClass *klass) FALSE, GIMP_PARAM_STATIC_STRINGS); - GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_COLOR_OPTIONS_EXPANDED, - "color-options-expanded", - NULL, NULL, - FALSE, - GIMP_PARAM_STATIC_STRINGS); - GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MERGE_FILTER, "merge-filter", _("_Merge filter"), @@ -165,10 +158,6 @@ gimp_filter_options_set_property (GObject *object, options->blending_options_expanded = g_value_get_boolean (value); break; - case PROP_COLOR_OPTIONS_EXPANDED: - options->color_options_expanded = g_value_get_boolean (value); - break; - case PROP_MERGE_FILTER: options->merge_filter = g_value_get_boolean (value); break; @@ -213,10 +202,6 @@ gimp_filter_options_get_property (GObject *object, g_value_set_boolean (value, options->blending_options_expanded); break; - case PROP_COLOR_OPTIONS_EXPANDED: - g_value_set_boolean (value, options->color_options_expanded); - break; - case PROP_MERGE_FILTER: g_value_set_boolean (value, options->merge_filter); break; diff --git a/app/tools/gimpfilteroptions.h b/app/tools/gimpfilteroptions.h index 1fb39b19a5..b41a677dff 100644 --- a/app/tools/gimpfilteroptions.h +++ b/app/tools/gimpfilteroptions.h @@ -43,7 +43,6 @@ struct _GimpFilterOptions gboolean controller; gboolean blending_options_expanded; - gboolean color_options_expanded; gboolean merge_filter; };