r23345 - gnucash/trunk/src - Use the symbol in iso-4217-currencies by default

[Geert Janssens]

Author: gjanssens
Date: 2013-10-28 05:22:38 -0400 (Mon, 28 Oct 2013)
New Revision: 23345
Trac: http://svn.gnucash.org/trac/changeset/23345

Modified:
   gnucash/trunk/src/app-utils/gnc-ui-util.c
   gnucash/trunk/src/engine/iso-currencies-to-c
Log:
Use the symbol in iso-4217-currencies by default

Author:    Frédéric Perrin <frederic.perrin at resel.fr>

Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c	2013-10-28 01:02:53 UTC (rev 23344)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c	2013-10-28 09:22:38 UTC (rev 23345)
@@ -1754,14 +1754,10 @@
     if (!cm) return NULL;
 
     nice_symbol = gnc_commodity_get_user_symbol(cm);
-    if (nice_symbol)
-	return nice_symbol;
-    else if (gnc_commodity_equiv (cm, gnc_locale_default_currency_nodefault ()))
-	return gnc_localeconv()->currency_symbol;
-    else if ((nice_symbol = gnc_commodity_get_mnemonic(cm)))
-	return nice_symbol;
+    if (nice_symbol && *nice_symbol)
+        return nice_symbol;
     else
-	return "";
+        return gnc_commodity_get_mnemonic(cm);
 }
 
 /********************************************************************\

Modified: gnucash/trunk/src/engine/iso-currencies-to-c
===================================================================
--- gnucash/trunk/src/engine/iso-currencies-to-c	2013-10-28 01:02:53 UTC (rev 23344)
+++ gnucash/trunk/src/engine/iso-currencies-to-c	2013-10-28 09:22:38 UTC (rev 23345)
@@ -54,12 +54,14 @@
         PWARN(\"failed to insert %s into commodity table\", fullname);
       }
     }
+    gnc_commodity_set_user_symbol(c, ~S);
   }\n"
 	     fullname
 	     namespace
 	     mnemonic
 	     exchange-code
-	     smallest-fraction)
+	     smallest-fraction
+	     local-symbol)
 
 	    ;; Sorry, code doubling of the error message, but whatever.
 	    (begin