# HG changeset patch # User zas_ # Date 1208038238 0 # Node ID 07490120df2d22ac22112f134b636fd9b7094c3e # Parent 15c6b94545a20eefe1dcbbc516505673dcc99aed Rename dupe_custom_threshold option to duplicates_similarity_threshold. diff -r 15c6b94545a2 -r 07490120df2d src/dupe.c --- a/src/dupe.c Sat Apr 12 22:04:29 2008 +0000 +++ b/src/dupe.c Sat Apr 12 22:10:38 2008 +0000 @@ -1168,7 +1168,7 @@ if (mask & DUPE_MATCH_SIM_HIGH) m = 0.95; else if (mask & DUPE_MATCH_SIM_MED) m = 0.90; - else if (mask & DUPE_MATCH_SIM_CUSTOM) m = (gdouble)options->dupe_custom_threshold / 100.0; + else if (mask & DUPE_MATCH_SIM_CUSTOM) m = (gdouble)options->duplicates_similarity_threshold / 100.0; else m = 0.85; if (fast) diff -r 15c6b94545a2 -r 07490120df2d src/globals.c --- a/src/globals.c Sat Apr 12 22:04:29 2008 +0000 +++ b/src/globals.c Sat Apr 12 22:10:38 2008 +0000 @@ -107,7 +107,7 @@ options->fullscreen.show_info = TRUE; options->fullscreen.info = NULL; - options->dupe_custom_threshold = 99; + options->duplicates_similarity_threshold = 99; options->file_sort.case_sensitive = FALSE; diff -r 15c6b94545a2 -r 07490120df2d src/preferences.c --- a/src/preferences.c Sat Apr 12 22:04:29 2008 +0000 +++ b/src/preferences.c Sat Apr 12 22:10:38 2008 +0000 @@ -256,7 +256,7 @@ options->update_on_time_change = c_options->update_on_time_change; options->image.exif_rotate_enable = c_options->image.exif_rotate_enable; - options->dupe_custom_threshold = c_options->dupe_custom_threshold; + options->duplicates_similarity_threshold = c_options->duplicates_similarity_threshold; options->tree_descend_subdirs = c_options->tree_descend_subdirs; #ifdef DEBUG @@ -1371,7 +1371,7 @@ options->enable_metadata_dirs, &c_options->enable_metadata_dirs); pref_spin_new_int(group, _("Custom similarity threshold:"), NULL, - 0, 100, 1, options->dupe_custom_threshold, &c_options->dupe_custom_threshold); + 0, 100, 1, options->duplicates_similarity_threshold, &c_options->duplicates_similarity_threshold); pref_spin_new_int(group, _("Offscreen cache size (Mb per image):"), NULL, 0, 128, 1, options->image.tile_cache_max, &c_options->image.tile_cache_max); diff -r 15c6b94545a2 -r 07490120df2d src/rcfile.c --- a/src/rcfile.c Sat Apr 12 22:04:29 2008 +0000 +++ b/src/rcfile.c Sat Apr 12 22:10:38 2008 +0000 @@ -289,7 +289,7 @@ write_bool_option(ssi, "progressive_keyboard_scrolling", options->progressive_key_scrolling); write_bool_option(ssi, "local_metadata", options->enable_metadata_dirs); - write_int_option(ssi, "custom_similarity_threshold", options->dupe_custom_threshold); + write_int_option(ssi, "duplicates_similarity_threshold", options->duplicates_similarity_threshold); secure_fputc(ssi, '\n'); write_bool_option(ssi, "mouse_wheel_scrolls", options->mousewheel_scrolls); @@ -559,8 +559,8 @@ options->startup_path = read_char_option(f, option, "startup_path", value_all, options->startup_path); - options->dupe_custom_threshold = read_int_option(f, option, - "custom_similarity_threshold", value, options->dupe_custom_threshold); + options->duplicates_similarity_threshold = read_int_option(f, option, + "duplicates_similarity_threshold", value, options->duplicates_similarity_threshold); options->progressive_key_scrolling = read_bool_option(f, option, "progressive_keyboard_scrolling", value, options->progressive_key_scrolling); diff -r 15c6b94545a2 -r 07490120df2d src/typedefs.h --- a/src/typedefs.h Sat Apr 12 22:04:29 2008 +0000 +++ b/src/typedefs.h Sat Apr 12 22:10:38 2008 +0000 @@ -748,7 +748,7 @@ gint lazy_image_sync; gint update_on_time_change; - gint dupe_custom_threshold; + gint duplicates_similarity_threshold; gint recent_list_max;