[gthumb] fixed saving of tags

[Paolo Bacchilega <paobac src gnome org>]

commit ca596ee27c69e57bff8f06d9b1394dba78663593
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Aug 26 13:50:44 2010 +0200

    fixed saving of tags

 extensions/exiv2_tools/exiv2-utils.cpp |    6 +++---
 gthumb/gth-string-list.c               |    2 +-
 gthumb/gth-tags-entry.c                |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
index 0c24f8e..0fdc75a 100644
--- a/extensions/exiv2_tools/exiv2-utils.cpp
+++ b/extensions/exiv2_tools/exiv2-utils.cpp
@@ -164,9 +164,9 @@ const char *_LOCATION_TAG_NAMES[] = {
 };
 
 const char *_KEYWORDS_TAG_NAMES[] = {
-	"Xmp::dc::subject",
-	"Xmp::iptc::Keywords",
 	"Iptc::Application2::Keywords",
+	"Xmp::iptc::Keywords",
+	"Xmp::dc::subject",
 	NULL
 };
 
@@ -446,7 +446,7 @@ set_string_list_attribute_from_tagset (GFileInfo  *info,
 		GthStringList  *string_list;
 
 		g_object_get (metadata, "raw", &raw, NULL);
-		keywords = g_strsplit (raw, ", ", -1);
+		keywords = g_strsplit (raw, ",", -1);
 		string_list = gth_string_list_new_from_strv (keywords);
 		g_file_info_set_attribute_object (info, attribute, G_OBJECT (string_list));
 
diff --git a/gthumb/gth-string-list.c b/gthumb/gth-string-list.c
index 18c7108..4392f31 100644
--- a/gthumb/gth-string-list.c
+++ b/gthumb/gth-string-list.c
@@ -102,7 +102,7 @@ gth_string_list_new_from_strv (char **strv)
 	string_list = g_object_new (GTH_TYPE_STRING_LIST, NULL);
 	if (strv != NULL) {
 		for (i = 0; strv[i] != NULL; i++)
-			string_list->priv->list = g_list_prepend (string_list->priv->list, g_strdup (strv[i]));
+			string_list->priv->list = g_list_prepend (string_list->priv->list, g_strdup (g_strstrip (strv[i])));
 		string_list->priv->list = g_list_reverse (string_list->priv->list);
 	}
 	else
diff --git a/gthumb/gth-tags-entry.c b/gthumb/gth-tags-entry.c
index a3f1246..3db7fe8 100644
--- a/gthumb/gth-tags-entry.c
+++ b/gthumb/gth-tags-entry.c
@@ -849,7 +849,7 @@ gth_tags_entry_get_tags (GthTagsEntry *self,
 	for (i = 0, j = 0; all_tags[i] != NULL; i++) {
 		all_tags[i] = g_strstrip (all_tags[i]);
 		if (all_tags[i][0] != '\0') {
-			tags[j] = g_strdup (all_tags[i]);
+			tags[j] = g_strdup (g_strstrip (all_tags[i]));
 			if (update_globals)
 				gth_tags_file_add (tags_file, tags[j]);
 			j++;