gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/f3609c3e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/677b44c8 (commit)
	from  https://github.com/Gnucash/gnucash/commit/6df74eb9 (commit)



commit f3609c3e4e6dcfc0eb7be25021b7232acca55f4a
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Jan 3 21:57:58 2021 +0800

    [report-core] deprecate gnc:restore-report-by-guid

diff --git a/gnucash/report/report-core.scm b/gnucash/report/report-core.scm
index 8cc9e6bd0..f61d1a716 100644
--- a/gnucash/report/report-core.scm
+++ b/gnucash/report/report-core.scm
@@ -385,6 +385,8 @@ not found.")))
 
 
 (define (gnc:restore-report-by-guid id template-id template-name options)
+  (issue-deprecation-warning "gnc:restore-report-by-guid is now deprecated.
+ use gnc:restore-report-by-guid-with-custom-template instead.")
   (if options
       (let* ((r (make-report template-id id options #t #t #f #f ""))
              (report-id (gnc-report-add r)))

commit 677b44c8396e6ea119695926a6cc401c80e99a2a
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Jan 3 21:31:29 2021 +0800

    [report-core] remove 2.6/2.4 compatibility code

diff --git a/gnucash/report/report-core.scm b/gnucash/report/report-core.scm
index 931f873a3..8cc9e6bd0 100644
--- a/gnucash/report/report-core.scm
+++ b/gnucash/report/report-core.scm
@@ -531,24 +531,12 @@ not found.")))
     (gnc:report-template-name
      (hash-ref *gnc:_report-templates_* (gnc:report-type report))))
    (gnc:generate-restore-forms (gnc:report-options report) "options")
-   ;; 2.6->2.4 compatibility code prefix
-   ;; Temporary check to make the new report saving code more or less backwards
-   ;; compatible with older gnucash versions. This can be removed again in 2.8.
-   "(if (defined? 'gnc:restore-report-by-guid-with-custom-template)\n"
-   ;; end of 2.6->2.4 compatibility code prefix.
    (format
     #f "  (gnc:restore-report-by-guid-with-custom-template ~S ~S ~S ~S options)\n"
     (gnc:report-id report) (gnc:report-type report)
     (gnc:report-template-name
      (hash-ref *gnc:_report-templates_* (gnc:report-type report)))
     (gnc:report-custom-template report))
-   ;; 2.6->2.4 compatibility code suffix
-   (format
-    #f "  (gnc:restore-report-by-guid ~S ~S ~S options))\n"
-    (gnc:report-id report) (gnc:report-type report)
-    (gnc:report-template-name
-     (hash-ref *gnc:_report-templates_* (gnc:report-type report))))
-   ;; end of 2.6->2.4 compatibility code suffix.
    ")"))
 
 ;; Generate guile code required to recreate embedded report instances



Summary of changes:
 gnucash/report/report-core.scm | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)