Rename dupe_custom_threshold option to duplicates_similarity_threshold.

diff --git a/src/dupe.c b/src/dupe.c
index 0e40e87..9871bc3 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -1168,7 +1168,7 @@ static gint dupe_match(DupeItem *a, DupeItem *b, DupeMatchType mask, gdouble *ra
 
                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 --git a/src/globals.c b/src/globals.c
index 9d36ac5..d76b627 100644 (file)
--- a/src/globals.c
+++ b/src/globals.c
@@ -107,7 +107,7 @@ ConfOptions *init_options(ConfOptions *options)
        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 --git a/src/preferences.c b/src/preferences.c
index b6da0f3..4c7e624 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -256,7 +256,7 @@ static void config_window_apply(void)
        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 @@ static void config_tab_advanced(GtkWidget *notebook)
                              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 --git a/src/rcfile.c b/src/rcfile.c
index 412e283..4a84daa 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -289,7 +289,7 @@ void save_options(void)
        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 @@ void load_options(void)
                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 --git a/src/typedefs.h b/src/typedefs.h
index 4ef902a..a8065bc 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -748,7 +748,7 @@ struct _ConfOptions
        gint lazy_image_sync;
        gint update_on_time_change;
 
-       gint dupe_custom_threshold;
+       gint duplicates_similarity_threshold;
 
        gint recent_list_max;