use "keywords" instead of "tags" in option name, it is more consistent

BestImageViewer · May 7, 2009 · 34a545b · 34a545b
1 parent fb440ec
commit 34a545b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/metadata.c b/src/metadata.c
@@ -880,7 +880,7 @@ gboolean keyword_exists(GtkTreeModel *keyword_tree, GtkTreeIter *parent_ptr, Gtk
 		{
 		if (!(exclude_sibling && sibling && keyword_compare(keyword_tree, &iter, sibling) == 0))
 			{
-			if (options->metadata.tags_case_sensitive)
+			if (options->metadata.keywords_case_sensitive)
 				{
 				gchar *iter_name = keyword_get_name(keyword_tree, &iter);
 				ret = strcmp(name, iter_name) == 0;
@@ -1093,7 +1093,7 @@ gboolean keyword_tree_is_set(GtkTreeModel *keyword_tree, GtkTreeIter *iter, GLis
 	GList *casefold_list = NULL;
 	GList *work;
 
-	if (options->metadata.tags_case_sensitive)
+	if (options->metadata.keywords_case_sensitive)
 		{
 		ret = keyword_tree_is_set_casefull(keyword_tree, *iter, kw_list);
 		}

diff --git a/src/options.c b/src/options.c
@@ -103,7 +103,7 @@ ConfOptions *init_options(ConfOptions *options)
 	options->metadata.confirm_timeout = 10;
 	options->metadata.confirm_on_image_change = FALSE;
 	options->metadata.confirm_on_dir_change = TRUE;
-	options->metadata.tags_case_sensitive = FALSE;
+	options->metadata.keywords_case_sensitive = FALSE;
 	options->metadata.write_orientation = TRUE;
 
 	options->show_icon_names = TRUE;

diff --git a/src/options.h b/src/options.h
@@ -177,7 +177,7 @@ struct _ConfOptions
 		gboolean confirm_after_timeout;
 		gboolean confirm_on_image_change;
 		gboolean confirm_on_dir_change;
-		gboolean tags_case_sensitive;
+		gboolean keywords_case_sensitive;
 		gboolean write_orientation;
 	} metadata;
 

diff --git a/src/preferences.c b/src/preferences.c
@@ -324,7 +324,7 @@ static void config_window_apply(void)
 	options->metadata.confirm_after_timeout = c_options->metadata.confirm_after_timeout;
 	options->metadata.confirm_on_image_change = c_options->metadata.confirm_on_image_change;
 	options->metadata.confirm_on_dir_change = c_options->metadata.confirm_on_dir_change;
-	options->metadata.tags_case_sensitive = c_options->metadata.tags_case_sensitive;
+	options->metadata.keywords_case_sensitive = c_options->metadata.keywords_case_sensitive;
 	options->metadata.write_orientation = c_options->metadata.write_orientation;
 
 #ifdef DEBUG
@@ -1369,7 +1369,7 @@ static void config_tab_metadata(GtkWidget *notebook)
 			      options->metadata.confirm_on_dir_change, &c_options->metadata.confirm_on_dir_change);
 
 	pref_checkbox_new_int(group, _("Allow keywords to differ only in case"),
-			      options->metadata.tags_case_sensitive, &c_options->metadata.tags_case_sensitive);
+			      options->metadata.keywords_case_sensitive, &c_options->metadata.keywords_case_sensitive);
 
 	pref_checkbox_new_int(group, _("Write altered image orientation to the metadata"),
 			      options->metadata.write_orientation, &c_options->metadata.write_orientation);

diff --git a/src/rcfile.c b/src/rcfile.c
@@ -437,7 +437,7 @@ static void write_global_attributes(GString *outstr, gint indent)
 	WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_after_timeout);
 	WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_on_image_change);
 	WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_on_dir_change);
-	WRITE_NL(); WRITE_BOOL(*options, metadata.tags_case_sensitive);
+	WRITE_NL(); WRITE_BOOL(*options, metadata.keywords_case_sensitive);
 	WRITE_NL(); WRITE_BOOL(*options, metadata.write_orientation);
 
 }
@@ -697,7 +697,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
 		if (READ_INT(*options, metadata.confirm_timeout)) continue;
 		if (READ_BOOL(*options, metadata.confirm_on_image_change)) continue;
 		if (READ_BOOL(*options, metadata.confirm_on_dir_change)) continue;
-		if (READ_BOOL(*options, metadata.tags_case_sensitive)) continue;
+		if (READ_BOOL(*options, metadata.keywords_case_sensitive)) continue;
 		if (READ_BOOL(*options, metadata.write_orientation)) continue;
 
 		log_printf("unknown attribute %s = %s\n", option, value);