Similarly ensure for aqbanking/mt940 import that all retrieved strings

will be valid utf8.



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14363 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-06-14 19:49:25 +00:00
parent cd7747e925
commit e5c580440f
2 changed files with 14 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2006-06-14 Christian Stimming <stimming@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@employees.org> 2006-06-13 David Hampton <hampton@employees.org>
* src/import-export/qif-import/druid-qif-import.c: Do a better job * src/import-export/qif-import/druid-qif-import.c: Do a better job

View File

@ -35,6 +35,7 @@
#include "gnc-gconf-utils.h" #include "gnc-gconf-utils.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
#include "qof.h" #include "qof.h"
#include "gnc-glib-utils.h"
#define AQBANKING_NOWARN_DEPRECATED #define AQBANKING_NOWARN_DEPRECATED
#include "gnc-hbci-utils.h" #include "gnc-hbci-utils.h"
@ -477,6 +478,9 @@ static void *gnc_list_string_cb (const char *string, void *user_data)
g_strstrip (tmp1); g_strstrip (tmp1);
if (strlen (tmp1) > 0) { if (strlen (tmp1) > 0) {
/* Ensure string is in utf8 */
gnc_utf8_strip_invalid (tmp1);
if (*res != NULL) { if (*res != NULL) {
/* The " " is the separating string in between each two strings. */ /* The " " is the separating string in between each two strings. */
tmp2 = g_strjoin (" ", *res, tmp1, NULL); tmp2 = g_strjoin (" ", *res, tmp1, NULL);
@ -578,6 +582,9 @@ char *gnc_hbci_memo_tognc (const AB_TRANSACTION *h_trans)
/* g_strstrip (h_transactionText); */ /* g_strstrip (h_transactionText); */
g_strstrip (h_otherAccountId); g_strstrip (h_otherAccountId);
g_strstrip (h_otherBankCode); g_strstrip (h_otherBankCode);
/* Ensure string is in utf8 */
gnc_utf8_strip_invalid (h_otherAccountId);
gnc_utf8_strip_invalid (h_otherBankCode);
g_memo = g_memo =
(h_otherAccountId && (strlen (h_otherAccountId) > 0) ? (h_otherAccountId && (strlen (h_otherAccountId) > 0) ?
@ -585,6 +592,7 @@ char *gnc_hbci_memo_tognc (const AB_TRANSACTION *h_trans)
_("Account"), h_otherAccountId, _("Account"), h_otherAccountId,
_("Bank"), h_otherBankCode) : _("Bank"), h_otherBankCode) :
g_strdup ("")); g_strdup (""));
gnc_utf8_strip_invalid (g_memo);
g_free (h_otherAccountId); g_free (h_otherAccountId);
g_free (h_otherBankCode); g_free (h_otherBankCode);