IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use original guile variable names changed in #1073

Browse Source 
The changes 09296dfb96, 1373233cd0 and 189db58e6 had caused
inconsistencies. Best restore original guile variable names using
underscore, bound to strings instead of functions returning strings.
This commit is contained in:
Christopher Lam 2022-03-20 12:26:26 +08:00
parent 189db58e69
commit cf1282501e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/guile/engine.scm
View File

@ -37,8 +37,8 @@
(export account-full-name<?) (export account-full-name<?)
(export accounts-get-children-depth) (export accounts-get-children-depth)
(define-public GNC-COMMODITY-NS-CURRENCY "CURRENCY") (define-public GNC_COMMODITY_NS_CURRENCY "CURRENCY")
(define-public GNC-COMMODITY-NS-NONCURRENCY (gettext "ALL NON-CURRENCY")) (define-public GNC_COMMODITY_NS_NONCURRENCY (gettext "ALL NON-CURRENCY"))
(define (gnc-pricedb-lookup-latest-before-t64 . args) (define (gnc-pricedb-lookup-latest-before-t64 . args)
(issue-deprecation-warning "gnc-pricedb-lookup-latest-before-t64 has been renamed to gnc-pricedb-lookup-nearest-before-t64") (issue-deprecation-warning "gnc-pricedb-lookup-latest-before-t64 has been renamed to gnc-pricedb-lookup-nearest-before-t64")

6
gnucash/import-export/qif-imp/qif-dialog-utils.scm
View File

@ -736,7 +736,7 @@
;; compatible with the QIF type? ;; compatible with the QIF type?
(and (string=? s (caddr elt)) (and (string=? s (caddr elt))
(not (and (string? qif-type) (not (and (string? qif-type)
(string=? (GNC-COMMODITY-NS-NONCURRENCY) (string=? GNC_COMMODITY_NS_NONCURRENCY
(cadr elt)) (cadr elt))
(or (string-ci=? qif-type "stock") (or (string-ci=? qif-type "stock")
(string-ci=? qif-type "etf")))))) (string-ci=? qif-type "etf"))))))
@ -745,7 +745,7 @@
;; If a preferences match was found, use its namespace. ;; If a preferences match was found, use its namespace.
(if pref-match (cadr pref-match)) (if pref-match (cadr pref-match))
;; There's no symbol. Default to a fund. ;; There's no symbol. Default to a fund.
(GNC-COMMODITY-NS-NONCURRENCY)))) GNC_COMMODITY_NS_NONCURRENCY)))
;; Was a QIF type given? ;; Was a QIF type given?
(if (string? qif-type) (if (string? qif-type)
@ -753,7 +753,7 @@
(if (or (if (or
(string-ci=? qif-type "mutual fund") (string-ci=? qif-type "mutual fund")
(string-ci=? qif-type "index")) (string-ci=? qif-type "index"))
(GNC-COMMODITY-NS-NONCURRENCY) GNC_COMMODITY_NS_NONCURRENCY
(guess-by-symbol qif-symbol))) (guess-by-symbol qif-symbol)))
;; No QIF type was given, so guess a ;; No QIF type was given, so guess a

2
gnucash/import-export/qif-imp/qif-to-gnc.scm
View File

@ -270,7 +270,7 @@
(default-currency (default-currency
(gnc-commodity-table-find-full (gnc-commodity-table-find-full
(gnc-commodity-table-get-table (gnc-get-current-book)) (gnc-commodity-table-get-table (gnc-get-current-book))
(GNC-COMMODITY-NS-CURRENCY) default-currency-name)) GNC_COMMODITY_NS_CURRENCY default-currency-name))
(sorted-accounts-list '()) (sorted-accounts-list '())
(markable-xtns '()) (markable-xtns '())
(sorted-qif-files-list (sort qif-files-list (sorted-qif-files-list (sort qif-files-list

6
libgnucash/app-utils/options.scm
View File

@ -435,7 +435,7 @@ the option '~a'."))
(if (string? currency) (if (string? currency)
(gnc-commodity-table-lookup (gnc-commodity-table-lookup
(gnc-commodity-table-get-table (gnc-get-current-book)) (gnc-commodity-table-get-table (gnc-get-current-book))
(GNC-COMMODITY-NS-CURRENCY) currency) GNC_COMMODITY_NS_CURRENCY currency)
currency)) currency))
(let* ((value (currency->scm default-value)) (let* ((value (currency->scm default-value))
@ -561,7 +561,7 @@ the option '~a'."))
(define (commodity->scm commodity) (define (commodity->scm commodity)
(if (string? commodity) (if (string? commodity)
(list 'commodity-scm (list 'commodity-scm
(GNC-COMMODITY-NS-CURRENCY) GNC_COMMODITY_NS_CURRENCY
commodity) commodity)
(list 'commodity-scm (list 'commodity-scm
(gnc-commodity-get-namespace commodity) (gnc-commodity-get-namespace commodity)
@ -1560,7 +1560,7 @@ the option '~a'."))
(if (string? currency-string) (if (string? currency-string)
(gnc-commodity-table-lookup (gnc-commodity-table-lookup
(gnc-commodity-table-get-table (gnc-get-current-book)) (gnc-commodity-table-get-table (gnc-get-current-book))
(GNC-COMMODITY-NS-CURRENCY) currency-string) GNC_COMMODITY_NS_CURRENCY currency-string)
#f)) #f))
(define (currency? val) (define (currency? val)