gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/f9d23de8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/768df3b7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/448d9755 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0ad94ddc (commit)
	from  https://github.com/Gnucash/gnucash/commit/509ce16a (commit)



commit f9d23de8c061ae8348a74abe3a8b40d29decadd0
Merge: 509ce16 768df3b
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Mar 30 12:42:59 2017 -0700

    Merge Ueli Neiderer's swift-transactiontxt branch into maint.

commit 768df3b70974a9f55ea21aad05ebcb4a8b647e86
Author: Ueli Niederer <github.com at junix.ch>
Date:   Thu Mar 30 20:53:45 2017 +0200

    Obey GNUcash coding style
    
    Corrected brace position.

commit 448d97553ff1765b8ac753220af19374fe95f09f
Author: Ueli Niederer <gnucash at junix.ch>
Date:   Thu Mar 30 20:17:44 2017 +0200

    Added a preference to control import behaivour of transaction text
    
    In order to allow to revert the newly introduced behaviour of putting
    transaction text in front of the extracted purpose, the feature can now
    be disabled through the preferences dialog.

commit 0ad94ddcc01ea11282b0875d4edb1f77c6db5644
Author: Ueli Niederer <gnucash at junix.ch>
Date:   Tue Mar 28 22:16:30 2017 +0200

    Including the transaction text into the purpose text
    
    Some banks include additional purpose information for a transaction in
    non-swift-section 17 (aka transaction text). If available, this
    transaction text is put in front of the other purpose texts to provide
    full transaction information.
    
    While the final solution is still under discussion. This change is a
    first low-impact implementation backported and distilled from the work
    discussed in gnucash/gnucash#139.



Summary of changes:
 src/import-export/aqb/dialog-ab.glade              | 23 ++++++++++++++++++++--
 src/import-export/aqb/gnc-ab-utils.c               | 13 +++++++++++-
 src/import-export/aqb/gnc-ab-utils.h               | 11 ++++++-----
 ...g.gnucash.dialogs.import.hbci.gschema.xml.in.in |  5 +++++
 4 files changed, 44 insertions(+), 8 deletions(-)