gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/0185a2fe (commit)
	 via  https://github.com/Gnucash/gnucash/commit/218aa4ad (commit)
	from  https://github.com/Gnucash/gnucash/commit/2f0ed09b (commit)



commit 0185a2fec87272eccaa4868ba9a325a7b1194d0f
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Mar 17 16:47:46 2025 -0700

    Bug 799533 - Saved reports configurations are opening with…
    
    No Accounts selected error
    Revert "[gnc-optiondb.i] don't add null accounts"

diff --git a/bindings/guile/gnc-optiondb.i b/bindings/guile/gnc-optiondb.i
index e3ccd8a90a..5d2cf7e0e7 100644
--- a/bindings/guile/gnc-optiondb.i
+++ b/bindings/guile/gnc-optiondb.i
@@ -294,7 +294,6 @@ scm_from_value<GncOptionAccountList>(GncOptionAccountList value)
     for (auto guid : value)
     {
         auto acct{xaccAccountLookup(&guid, book)};
-        if (!GNC_IS_ACCOUNT(acct)) continue;
         s_list = scm_cons(SWIG_NewPointerObj(acct, SWIGTYPE_p_Account, 0),
                           s_list);
     }
@@ -658,7 +657,7 @@ gnc_option_test_book_destroy(QofBook* book)
         SCM s_account = scm_car (node);
         Account* acct = (Account*)SWIG_MustGetPtr(s_account,
                                                   SWIGTYPE_p_Account, 1, 0);
-        if (GNC_IS_ACCOUNT(acct))
+        if (acct)
             $1.push_back(*qof_entity_get_guid(acct));
     }
 }
@@ -692,7 +691,7 @@ gnc_option_test_book_destroy(QofBook* book)
         SCM s_account = scm_car (node);
         Account* acct = (Account*)SWIG_MustGetPtr(s_account,
                                                   SWIGTYPE_p_Account, 1, 0);
-        if (GNC_IS_ACCOUNT(acct))
+        if (acct)
             alist.push_back(*qof_entity_get_guid(acct));
     }
     $1 = &alist;
@@ -707,7 +706,6 @@ gnc_option_test_book_destroy(QofBook* book)
         SCM s_account = scm_car (node);
         Account* acct = (Account*)SWIG_MustGetPtr(s_account,
                                                   SWIGTYPE_p_Account, 1, 0);
-        if (!GNC_IS_ACCOUNT(acct)) continue;
         acclist.push_back(*qof_entity_get_guid(acct));
     }
     $1 = &acclist;
@@ -726,7 +724,6 @@ gnc_option_test_book_destroy(QofBook* book)
     for (auto guid : $1)
     {
         auto acct{xaccAccountLookup(&guid, book)};
-        if (!GNC_IS_ACCOUNT(acct)) continue;
         $result = scm_cons(SWIG_NewPointerObj(acct, SWIGTYPE_p_Account, 0),
                            $result);
     }
@@ -740,7 +737,6 @@ gnc_option_test_book_destroy(QofBook* book)
     for (auto guid : *$1)
     {
         auto acct{xaccAccountLookup(&guid, book)};
-        if (!GNC_IS_ACCOUNT(acct)) continue;
         $result = scm_cons(SWIG_NewPointerObj(acct, SWIGTYPE_p_Account, 0),
                            $result);
     }

commit 218aa4ad87285cadccc02ec7c3d616d827b4a635
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Mar 17 16:31:06 2025 -0700

    Fix test-gnc-option-scheme-output to match fix for bug 799501.

diff --git a/bindings/guile/test/test-gnc-option-scheme-output.scm b/bindings/guile/test/test-gnc-option-scheme-output.scm
index efc53736b2..fa9a68cc8f 100644
--- a/bindings/guile/test/test-gnc-option-scheme-output.scm
+++ b/bindings/guile/test/test-gnc-option-scheme-output.scm
@@ -498,7 +498,7 @@ veritatis et quasi architecto beatae vitae dicta sunt, explicabo.")
 (let ((option (gnc:lookup-option options
                                  \"__reg\"
                                  \"query\")))
-  ((lambda (o) (if o (gnc:option-set-value o '~a))) option))
+  ((lambda (o) (if o (gnc:option-set-value o '~s))) option))
 
 " value))
  



Summary of changes:
 bindings/guile/gnc-optiondb.i                         | 8 ++------
 bindings/guile/test/test-gnc-option-scheme-output.scm | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)