gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/0f9a9e3c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/161a5d60 (commit)
	from  https://github.com/Gnucash/gnucash/commit/103a053e (commit)



commit 0f9a9e3c5eeab4f378b5f2f28491d1303df77f1e
Merge: 103a053e8 161a5d60c
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 2 13:56:31 2020 -0700

    Merge Hong Xu's 'potential_matches' into maint.

commit 161a5d60c0f5fc2352898d82c71141dff50a70d0
Author: Hong Xu <hong at topbug.net>
Date:   Sun Aug 2 12:14:03 2020 -0700

    Variable name correction: "import_trans_account" --> split_account
    
    I'm getting this error:
    
        /home/user/src/gnucash/gnucash/import-export/import-main-matcher.c: In
        function ‘gnc_gen_trans_list_show_all’:
        /home/user/src/gnucash/gnucash/import-export/import-main-matcher.c:1716:28:
        error: ‘import_trans_account’ may be used uninitialized in this
        function [-Werror=maybe-uninitialized]
                 per_account_list = g_hash_table_lookup (lists_per_accounts,
        import_trans_account);
                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        /home/user/src/gnucash/gnucash/import-export/import-main-matcher.c:1676:14:
        note: ‘import_trans_account’ was declared here
             Account *import_trans_account;
    
    Looks like the variable name was incorrect.



Summary of changes:
 gnucash/import-export/import-main-matcher.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)