# HG changeset patch
# User nadvornik
# Date 1241724615 0
# Node ID 1a5a3b7ca2cdc82a596a71389630218f02becabe
# Parent  e8fcb0b98bca656fe78f51790a5063cd459fc247
use "keywords" instead of "tags" in option name, it is more consistent

diff -r e8fcb0b98bca -r 1a5a3b7ca2cd src/metadata.c
--- a/src/metadata.c	Sun May 03 17:54:37 2009 +0000
+++ b/src/metadata.c	Thu May 07 19:30:15 2009 +0000
@@ -880,7 +880,7 @@
 		{
 		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 @@
 	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 -r e8fcb0b98bca -r 1a5a3b7ca2cd src/options.c
--- a/src/options.c	Sun May 03 17:54:37 2009 +0000
+++ b/src/options.c	Thu May 07 19:30:15 2009 +0000
@@ -103,7 +103,7 @@
 	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 -r e8fcb0b98bca -r 1a5a3b7ca2cd src/options.h
--- a/src/options.h	Sun May 03 17:54:37 2009 +0000
+++ b/src/options.h	Thu May 07 19:30:15 2009 +0000
@@ -177,7 +177,7 @@
 		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 -r e8fcb0b98bca -r 1a5a3b7ca2cd src/preferences.c
--- a/src/preferences.c	Sun May 03 17:54:37 2009 +0000
+++ b/src/preferences.c	Thu May 07 19:30:15 2009 +0000
@@ -324,7 +324,7 @@
 	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 @@
 			      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 -r e8fcb0b98bca -r 1a5a3b7ca2cd src/rcfile.c
--- a/src/rcfile.c	Sun May 03 17:54:37 2009 +0000
+++ b/src/rcfile.c	Thu May 07 19:30:15 2009 +0000
@@ -437,7 +437,7 @@
 	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 @@
 		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);