gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/1354698b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/81b48ee8 (commit)
	from  https://github.com/Gnucash/gnucash/commit/c2a44935 (commit)



commit 1354698b25fdbfe6883790be1bd26cb64645a704
Merge: c2a449356 81b48ee88
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Oct 12 11:09:10 2021 -0700

    Merge Jean Laroche's '798327_ofx_import_terminates_too_early' into maint.


commit 81b48ee8822ebfcf6f88b2e1a22c5191d3009201
Author: jean <27791933+jeanlaroche at users.noreply.github.com>
Date:   Sun Oct 3 20:46:15 2021 -0700

    Bug 798327 - Ofx import stops too early for multi-account OFX and one account has no new transactions
    info->response must show GTK_RESPONSE_OK for the import to pproceed, otherwise the code assumes the
    user canceled.

diff --git a/gnucash/import-export/ofx/gnc-ofx-import.c b/gnucash/import-export/ofx/gnc-ofx-import.c
index f7e9b1de4..fa55d1cbc 100644
--- a/gnucash/import-export/ofx/gnc-ofx-import.c
+++ b/gnucash/import-export/ofx/gnc-ofx-import.c
@@ -1216,6 +1216,8 @@ runMatcher(ofx_info* info, char * selected_filename, gboolean go_to_next_file)
             gnc_info_dialog (parent, _("While importing transactions from OFX file '%s' into account '%s', found %d previously imported transactions, no new transactions."),
                              selected_filename, acct_name, info->num_trans_processed);
             g_free (acct_name);
+            // This is required to ensure we don't mistakenly assume the user canceled.
+            info->response = GTK_RESPONSE_OK;
             gnc_ofx_match_done (NULL,info);
             return;
         }



Summary of changes:
 gnucash/import-export/ofx/gnc-ofx-import.c | 2 ++
 1 file changed, 2 insertions(+)