[Gnucash-changes] r14363 - gnucash/trunk - Similarly ensure for aqbanking/mt940 import that all retrieved strings

[Christian Stimming]

Author: cstim
Date: 2006-06-14 15:49:25 -0400 (Wed, 14 Jun 2006)
New Revision: 14363
Trac: http://svn.gnucash.org/trac/changeset/14363

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c
Log:
Similarly ensure for aqbanking/mt940 import that all retrieved strings
will be valid utf8.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-06-14 04:16:16 UTC (rev 14362)
+++ gnucash/trunk/ChangeLog	2006-06-14 19:49:25 UTC (rev 14363)
@@ -1,3 +1,9 @@
+2006-06-14  Christian Stimming  <stimming at tuhh.de>
+
+	* src/import-export/hbci/gnc-hbci-utils.c: Similarly ensure for
+	aqbanking/mt940 import that all retrieved strings will be valid
+	utf8.
+
 2006-06-13  David Hampton  <hampton at employees.org>
 
 	* src/import-export/qif-import/druid-qif-import.c: Do a better job

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c	2006-06-14 04:16:16 UTC (rev 14362)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c	2006-06-14 19:49:25 UTC (rev 14363)
@@ -35,6 +35,7 @@
 #include "gnc-gconf-utils.h"
 #include "gnc-ui-util.h"
 #include "qof.h" 
+#include "gnc-glib-utils.h"
 
 #define AQBANKING_NOWARN_DEPRECATED
 #include "gnc-hbci-utils.h"
@@ -477,6 +478,9 @@
 
   g_strstrip (tmp1);
   if (strlen (tmp1) > 0) {
+    /* Ensure string is in utf8 */
+    gnc_utf8_strip_invalid (tmp1);
+
     if (*res != NULL) {
       /* The " " is the separating string in between each two strings. */
       tmp2 = g_strjoin (" ", *res, tmp1, NULL);
@@ -578,6 +582,9 @@
   /*   g_strstrip (h_transactionText); */
   g_strstrip (h_otherAccountId);
   g_strstrip (h_otherBankCode);
+  /* Ensure string is in utf8 */
+  gnc_utf8_strip_invalid (h_otherAccountId);
+  gnc_utf8_strip_invalid (h_otherBankCode);
 
   g_memo = 
     (h_otherAccountId && (strlen (h_otherAccountId) > 0) ?
@@ -585,6 +592,7 @@
 		      _("Account"), h_otherAccountId,
 		      _("Bank"), h_otherBankCode) :
      g_strdup (""));
+  gnc_utf8_strip_invalid (g_memo);
     
   g_free (h_otherAccountId);
   g_free (h_otherBankCode);