gnucash maint: Multiple changes pushed

Christopher Lam clam at code.gnucash.org
Sat Nov 2 22:50:52 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/3f6c8478 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d56a47f1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/47030c76 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5870887f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b04c494f (commit)
	from  https://github.com/Gnucash/gnucash/commit/99dbb788 (commit)



commit 3f6c8478a4839e71811dfd857633f3bc0ff3c30a
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Nov 3 10:42:36 2019 +0800

    [view-column] don't emit raw html, include captured-error

diff --git a/gnucash/report/utility-reports/view-column.scm b/gnucash/report/utility-reports/view-column.scm
index b9ab5848d..df68cf689 100644
--- a/gnucash/report/utility-reports/view-column.scm
+++ b/gnucash/report/utility-reports/view-column.scm
@@ -138,9 +138,9 @@
 	     (gnc:html-table-cell-append-objects!
 	      contents-cell
 	      (gnc:make-html-text
-	       (string-append
-		"<h3>" (_ "Report error") "</h3><p>"
-		(_ "An error occurred while running the report.")))))
+	       (gnc:html-markup-h3 (_ "Report error"))
+               (_ "An error occurred while running the report.")
+               (gnc:html-markup "pre" gnc:last-captured-error))))
 
 	 ;; increment the alloc number for each occupied row
 	 (let loop ((row current-row-num))

commit d56a47f17af1c4345fae2d0b671b6fd4f3414d5b
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Nov 3 10:41:05 2019 +0800

    [c-interface] gnc:backtrace-if-exception returns #f if error
    
    previous would return *unspecified* when error was captured.
    old code seems to expect #f to signal error

diff --git a/libgnucash/app-utils/c-interface.scm b/libgnucash/app-utils/c-interface.scm
index 8c0b74b46..7e16d892b 100644
--- a/libgnucash/app-utils/c-interface.scm
+++ b/libgnucash/app-utils/c-interface.scm
@@ -69,7 +69,8 @@
       (display captured-error (current-error-port))
       (set! gnc:last-captured-error (gnc:html-string-sanitize captured-error))
       (when (defined? 'gnc:warn)
-        (gnc:warn captured-error)))
+        (gnc:warn captured-error))
+      #f)
      (else result))))
 
 (define-public gnc:last-captured-error "")

commit 47030c7654d182a33fdcc317af686f51e9ea6775
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Nov 2 23:48:38 2019 +0800

    [hello-world] fix indenting and incorrect change
    
    928f6145c had changed default list option '(good) to 'good - should be
    a list of symbols

diff --git a/gnucash/report/utility-reports/hello-world.scm b/gnucash/report/utility-reports/hello-world.scm
index 24a93e38f..b947cbddc 100644
--- a/gnucash/report/utility-reports/hello-world.scm
+++ b/gnucash/report/utility-reports/hello-world.scm
@@ -192,16 +192,16 @@
      (gnc:make-list-option
       (N_ "Hello Again") (N_ "A list option")
       "h" (N_ "This is a list option.")
-      'good
+      '(good)
       (list (vector 'good
-                   (N_ "The Good")
-                   (N_ "Good option."))
+                    (N_ "The Good")
+                    (N_ "Good option."))
             (vector 'bad
-                   (N_ "The Bad")
-                   (N_ "Bad option."))
+                    (N_ "The Bad")
+                    (N_ "Bad option."))
             (vector 'ugly
-                   (N_ "The Ugly")
-                   (N_ "Ugly option.")))))
+                    (N_ "The Ugly")
+                    (N_ "Ugly option.")))))
     
     ;; This option is for testing. When true, the report generates
     ;; an exception.

commit 5870887f1291041cca3a1e0805b988cf9992dcfc
Merge: 99dbb7889 b04c494f2
Author: Christian Stimming <christian at cstimming.de>
Date:   Sat Nov 2 23:30:54 2019 +0100

    Merge pull request #597 from ingoha/purpose-encoding
    
    Fix bug 797473, UTF-8 characters were not processed correctly with aqbanking6.


commit b04c494f244260a7d67f70b1f554ade1080f8d61
Author: Ingo Haschler <ih at ingohaschler.de>
Date:   Wed Oct 30 20:12:15 2019 +0100

    Bug 797473 - UTF8 characters not processed correctly with aqbanking6

diff --git a/gnucash/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
index 0f40e1586..4ba804ad6 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.c
+++ b/gnucash/import-export/aqb/gnc-ab-utils.c
@@ -331,7 +331,7 @@ join_ab_strings_cb(const gchar *str, gpointer user_data)
  
     tmp = g_strdup(str);
     g_strstrip(tmp);
-    gnc_utf8_strip_invalid(tmp);
+    gnc_utf8_strip_invalid_and_controls(tmp);
 
     if (*acc)
     {



Summary of changes:
 gnucash/import-export/aqb/gnc-ab-utils.c       |  2 +-
 gnucash/report/utility-reports/hello-world.scm | 14 +++++++-------
 gnucash/report/utility-reports/view-column.scm |  6 +++---
 libgnucash/app-utils/c-interface.scm           |  3 ++-
 4 files changed, 13 insertions(+), 12 deletions(-)



More information about the gnucash-changes mailing list