import homebank-5.1.7

[chaz/homebank] / src / hb-import-ofx.c

diff --git a/src/hb-import-ofx.c b/src/hb-import-ofx.c
index fba3a8d2a55a76328cdaf07bf19c562b902ab654..701d7326aa0d4bbdc4dbcff0c8d32ff6844eda2a 100644 (file)
--- a/src/hb-import-ofx.c
+++ b/src/hb-import-ofx.c
@@ -1,5 +1,5 @@
 /*     HomeBank -- Free, easy, personal accounting for everyone.
- *     Copyright (C) 1995-2016 Maxime DOYEN
+ *     Copyright (C) 1995-2018 Maxime DOYEN
  *
  *     This file is part of HomeBank.
  *
@@ -263,7 +263,7 @@ Transaction *newope;
                {
                        case 1: //to memo
                                DB( g_print(" -> name to memo: '%s'\n", data.name) );
-                               newope->wording = g_strdup(data.name);
+                               newope->memo = g_strdup(data.name);
 
                                //test
                                //strip_extra_spaces(newope->wording);
@@ -281,7 +281,13 @@ Transaction *newope;
                                g_strstrip(name);
                                //test
                                //strip_extra_spaces(name);
-                               
+
+                               #ifndef G_OS_UNIX
+                                       DB( g_print(" ensure UTF-8\n") );
+
+                                       name = homebank_utf8_ensure(name);
+                               #endif
+               
                                DB( g_print(" -> name to payee: '%s'\n", name) );
                                
                                payitem = da_pay_get_by_name(name);
@@ -330,12 +336,12 @@ Transaction *newope;
                                break;
 
                        case 2: //add to description
-                               old = newope->wording;
+                               old = newope->memo;
                                if(old == NULL)
-                                       newope->wording = g_strdup(data.memo);
+                                       newope->memo = g_strdup(data.memo);
                                else
                                {
-                                       newope->wording = g_strjoin(" ", old, data.memo, NULL);
+                                       newope->memo = g_strjoin(" ", old, data.memo, NULL);
                                        g_free(old);
                                }