IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rework two nearly identical fuctions into a common function with parameters.

Browse Source 
Keep the old function names as convenience wrappers around the new function.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19657 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens
2010-10-14 21:00:46 +00:00
parent ccb89d5d52
commit 072ee537ab
1 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app-utils/gnc-ui-util.c
+17 -39
View File
@@ -1014,21 +1014,22 @@ gnc_locale_default_currency (void)
}
gnc_commodity *
gnc_default_currency (void)
static gnc_commodity *
gnc_default_currency_common (gchar *requested_currency,
const gchar *gconf_section)
{
gnc_commodity *currency = NULL;
gchar *choice, *mnemonic;
if (user_default_currency)
if (requested_currency)
return gnc_commodity_table_lookup(gnc_get_current_commodities(),
GNC_COMMODITY_NS_CURRENCY,
user_default_currency);
requested_currency);
choice = gnc_gconf_get_string(GCONF_GENERAL, KEY_CURRENCY_CHOICE, NULL);
if (choice && strcmp(choice, "other") == 0)
choice = gnc_gconf_get_string(gconf_section, KEY_CURRENCY_CHOICE, NULL);
if (g_strcmp0(choice, "other") == 0)
{
mnemonic = gnc_gconf_get_string(GCONF_GENERAL, KEY_CURRENCY_OTHER, NULL);
mnemonic = gnc_gconf_get_string(gconf_section, KEY_CURRENCY_OTHER, NULL);
currency = gnc_commodity_table_lookup(gnc_get_current_commodities(),
GNC_COMMODITY_NS_CURRENCY, mnemonic);
DEBUG("mnemonic %s, result %p", mnemonic ? mnemonic : "(null)", currency);
@@ -1040,48 +1041,25 @@ gnc_default_currency (void)
currency = gnc_locale_default_currency ();
if (currency)
{
mnemonic = user_default_currency;
user_default_currency = g_strdup(gnc_commodity_get_mnemonic(currency));
mnemonic = requested_currency;
requested_currency = g_strdup(gnc_commodity_get_mnemonic(currency));
g_free(mnemonic);
}
return currency;
}
gnc_commodity *
gnc_default_currency (void)
{
return gnc_default_currency_common (user_default_currency, GCONF_GENERAL);
}
gnc_commodity *
gnc_default_report_currency (void)
{
gnc_commodity *currency = NULL;
gchar *choice, *mnemonic;
if (user_report_currency)
return gnc_commodity_table_lookup(gnc_get_current_commodities(),
GNC_COMMODITY_NS_CURRENCY,
user_report_currency);
choice = gnc_gconf_get_string(GCONF_GENERAL_REPORT,
KEY_CURRENCY_CHOICE, NULL);
if (choice && strcmp(choice, "other") == 0)
{
mnemonic = gnc_gconf_get_string(GCONF_GENERAL_REPORT,
KEY_CURRENCY_OTHER, NULL);
currency = gnc_commodity_table_lookup(gnc_get_current_commodities(),
GNC_COMMODITY_NS_CURRENCY, mnemonic);
DEBUG("mnemonic %s, result %p", mnemonic ? mnemonic : "(null)", currency);
g_free(mnemonic);
}
g_free(choice);
if (!currency)
currency = gnc_locale_default_currency ();
if (currency)
{
mnemonic = user_report_currency;
user_report_currency = g_strdup(gnc_commodity_get_mnemonic(currency));
g_free(mnemonic);
}
return currency;
return gnc_default_currency_common (user_report_currency, GCONF_GENERAL_REPORT);
}
static void
gnc_currency_changed_cb (GConfEntry *entry, gpointer user_data)
{