gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/a63a4d5e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9f3ad551 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/082d0f30 (commit)
	from  https://github.com/Gnucash/gnucash/commit/91584df1 (commit)



commit a63a4d5e8a6ac50c553faec65e6360a0f6a17ce8
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Mar 22 22:03:35 2017 +0100

    Bug 739571 - Small fixups for previous commits
    
    - cleanup whitespace
    - add import-pending-matches.c to POTFILES.in
    - convert asserts into g_return(_val)_if_fail
    - handle the case where no matches are found (which can happen at least in the csv importer and I suspect in the OFX importer as well)

commit 9f3ad5510427eb69c857814de15e1c1be0727d2d
Author: Jesse Olmer <jesse at wickedgoodtimes.com>
Date:   Sat Feb 13 21:59:05 2016 -0800

    Bug 739571 - Matching imported transactions doesn't indicate previously matched entries
    
    Track pending matches from the current import and display this information in
    the match picker.
    
    Conflicts:
    	src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in
    	src/import-export/import-match-picker.c
    
    https://bugzilla.gnome.org/show_bug.cgi?id=739571

commit 082d0f305b4e73b679fb1690463061ee6b4c050f
Author: Jesse Olmer <jesse at wickedgoodtimes.com>
Date:   Sun Jan 17 15:36:56 2016 -0800

    Bug 739571 - Matching imported transactions doesn't indicate previously matched entries
    
    Display reconcile state of each transaction in Import Match Picker and allow
    user to toggle display of reconciled transactions.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=739571



Summary of changes:
 po/POTFILES.in                                     |   1 +
 src/import-export/CMakeLists.txt                   |   2 +
 src/import-export/Makefile.am                      |   2 +
 src/import-export/dialog-import.glade              |  19 +-
 ...nucash.dialogs.import.generic.gschema.xml.in.in |   5 +
 src/import-export/import-backend.c                 |  31 ++--
 src/import-export/import-backend.h                 |  16 +-
 src/import-export/import-main-matcher.c            |  20 +-
 src/import-export/import-match-picker.c            | 161 ++++++++++++-----
 src/import-export/import-match-picker.h            |   4 +-
 src/import-export/import-pending-matches.c         | 201 +++++++++++++++++++++
 src/import-export/import-pending-matches.h         |  62 +++++++
 src/import-export/test/CMakeLists.txt              |   7 +-
 src/import-export/test/Makefile.am                 |  25 +++
 .../test/test-import-pending-matches.c             | 131 ++++++++++++++
 15 files changed, 619 insertions(+), 68 deletions(-)
 create mode 100644 src/import-export/import-pending-matches.c
 create mode 100644 src/import-export/import-pending-matches.h
 create mode 100644 src/import-export/test/test-import-pending-matches.c