gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/21525713 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f7781681 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b047467e (commit)



commit 21525713a3bd5c464195e0d646031eba207b29dd
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sun Nov 1 11:17:50 2015 +0100

    Reduce code duplication

diff --git a/src/app-utils/gnc-ui-util.c b/src/app-utils/gnc-ui-util.c
index 797a998..9251c0f 100644
--- a/src/app-utils/gnc-ui-util.c
+++ b/src/app-utils/gnc-ui-util.c
@@ -1473,11 +1473,9 @@ xaccSPrintAmount (char * bufp, gnc_numeric val, GNCPrintAmountInfo info)
 
     if (info.commodity && info.use_symbol)
     {
-        if (gnc_commodity_is_iso (info.commodity))
-	    currency_symbol = gnc_commodity_get_nice_symbol (info.commodity);
-        else
+        currency_symbol = gnc_commodity_get_nice_symbol (info.commodity);
+        if (!gnc_commodity_is_iso (info.commodity))
         {
-            currency_symbol = gnc_commodity_get_nice_symbol (info.commodity);
             cs_precedes  = FALSE;
             sep_by_space = TRUE;
         }

commit f7781681bb6c3e1b87f9b42026c866b4cfc233a0
Author: yomlogs <dev at moonset.org>
Date:   Fri Oct 30 17:17:55 2015 +0000

    Bug 757378: display the user-defined display symbol for non-currency commodities.

diff --git a/src/app-utils/gnc-ui-util.c b/src/app-utils/gnc-ui-util.c
index 668e1b4..797a998 100644
--- a/src/app-utils/gnc-ui-util.c
+++ b/src/app-utils/gnc-ui-util.c
@@ -1477,7 +1477,7 @@ xaccSPrintAmount (char * bufp, gnc_numeric val, GNCPrintAmountInfo info)
 	    currency_symbol = gnc_commodity_get_nice_symbol (info.commodity);
         else
         {
-            currency_symbol = gnc_commodity_get_mnemonic (info.commodity);
+            currency_symbol = gnc_commodity_get_nice_symbol (info.commodity);
             cs_precedes  = FALSE;
             sep_by_space = TRUE;
         }



Summary of changes:
 src/app-utils/gnc-ui-util.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)