gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/f05128b2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ed2437e4 (commit)
	from  https://github.com/Gnucash/gnucash/commit/1d91873e (commit)



commit f05128b2c25e8d970aa275e632812d7671c5e89b
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Mar 28 09:18:54 2020 +0800

    Bug 797583 - gnc:book-add-quotes crashes when there are no quotes
    
    When Get Quotes being run on empty book, the gnc:book-add-quotes
    function expects book->commodity->fq-call-data to return #f

diff --git a/libgnucash/scm/price-quotes.scm b/libgnucash/scm/price-quotes.scm
index 0565000bf..0515be00c 100644
--- a/libgnucash/scm/price-quotes.scm
+++ b/libgnucash/scm/price-quotes.scm
@@ -199,10 +199,11 @@
          commodity-list)
 
         ;; Now translate to just what gnc-fq-helper expects.
-        (append
-         (hash-map->list cons commodity-hash)
-         (map (lambda (cmd) (cons (car cmd) (list (cdr cmd))))
-              currency-list-filtered)))))
+        (and (or (pair? currency-list-filtered) (pair? commodity-list))
+             (append
+              (hash-map->list cons commodity-hash)
+              (map (lambda (cmd) (cons (car cmd) (list (cdr cmd))))
+                   currency-list-filtered))))))
 
   (define (fq-call-data->fq-calls fq-call-data)
     ;; take an output element from book->commodity->fq-call-data and

commit ed2437e4270fef4871f2aab676192ca57bb65bba
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Mar 28 09:17:36 2020 +0800

    Bug 797656 - Immediate crash when retrieving quotes
    
    gettext needs to be imported

diff --git a/libgnucash/scm/price-quotes.scm b/libgnucash/scm/price-quotes.scm
index 5969ae86a..0565000bf 100644
--- a/libgnucash/scm/price-quotes.scm
+++ b/libgnucash/scm/price-quotes.scm
@@ -25,6 +25,7 @@
 (export gnc:book-add-quotes) ;; called from gnome/dialog-price-edit-db.c
 (export gnc:price-quotes-install-sources)
 
+(use-modules (gnucash gettext))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash core-utils))



Summary of changes:
 libgnucash/scm/price-quotes.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)