gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c1103a3a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1801fed4 (commit)
	from  https://github.com/Gnucash/gnucash/commit/7ce8c9d3 (commit)



commit c1103a3a52d8199664837e909aaa85801f136e6d
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 16 10:37:58 2018 -0700

    Bug 796586 - QIF import incorrectly converts unicode characters from...
    
    UTF8 encoded file
    
    Force UTF-8 encoding; the line processing includes checking each
    line for legal UTF-8 and transcoding it to the locale encoding.

diff --git a/gnucash/import-export/qif-imp/qif-file.scm b/gnucash/import-export/qif-imp/qif-file.scm
index 2a0eb51..f053daa 100644
--- a/gnucash/import-export/qif-imp/qif-file.scm
+++ b/gnucash/import-export/qif-imp/qif-file.scm
@@ -516,7 +516,7 @@
                 ;; ...and this is if we read a null or eof line.
                 (if (and (not abort-read)
                          (not (eof-object? line)))
-                    (line-loop))))))
+                    (line-loop))))) #:encoding "UTF-8")
 
       ;; Reverse the transaction list so xtns are in the same order that
       ;; they appeared in the file.  This is important in a few cases.

commit 1801fed486b4c2ad4acd1fa6df714be3147c003e
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jun 15 16:42:02 2018 -0700

    Remove emacs spoor from POTFILES.in

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ede339f..b8cc820 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -347,7 +347,6 @@ gnucash/import-export/ofx/gnc-ofx-import.c
 gnucash/import-export/ofx/gnc-ofx-kvp.c
 gnucash/import-export/ofx/gnc-plugin-ofx.c
 gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
-gnucash/import-export/qif-imp/.#assistant-qif-import.c
 gnucash/import-export/qif-imp/assistant-qif-import.c
 gnucash/import-export/qif-imp/dialog-account-picker.c
 gnucash/import-export/qif-imp/gncmod-qif-import.c



Summary of changes:
 gnucash/import-export/qif-imp/qif-file.scm | 2 +-
 po/POTFILES.in                             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)