Text merge backend now assumes text files are encoded according to the current locale...

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@364 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/merge-text.c b/glabels2/src/merge-text.c
index 1465ff0595d962f48098dfd36f3df59677dfb372..5aceefe4122181afc876fa0478a20f0dc014d556 100644 (file)
--- a/glabels2/src/merge-text.c
+++ b/glabels2/src/merge-text.c
@@ -349,7 +349,11 @@ gl_merge_text_get_record (glMerge *merge)
 
                field = g_new0 (glMergeField, 1);
                field->key = g_strdup_printf ("%d", i_field++);
+#ifndef CSV_ALWAYS_UTF8
+               field->value = g_locale_to_utf8 (p->data, -1, NULL, NULL, NULL);
+#else
                field->value = g_strdup (p->data);
+#endif
 
                record->field_list = g_list_append (record->field_list, field);
        }