From: Jim Evins <evins@snaught.com>
Date: Mon, 1 Dec 2003 02:48:34 +0000 (+0000)
Subject: Text merge backend now assumes text files are encoded according to the current locale... 
X-Git-Tag: glabels-2_3_0~530
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fb57f0fc0e806719cd1efacde8da67492eeed71d;p=glabels

Text merge backend now assumes text files are encoded according to the current locale -- converts to UTF8 for internal use.


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 1465ff05..5aceefe4 100644
--- 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);
 	}