r23211 - gnucash/trunk/src - Remove obsolete enable_euro key from gconf
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 7 10:01:52 EDT 2013
Author: gjanssens
Date: 2013-10-07 10:01:51 -0400 (Mon, 07 Oct 2013)
New Revision: 23211
Trac: http://svn.gnucash.org/trac/changeset/23211
Modified:
gnucash/trunk/src/app-utils/gnc-gconf-utils.h
gnucash/trunk/src/gnome-utils/window-main-summarybar.c
gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas.in
Log:
Remove obsolete enable_euro key from gconf
Modified: gnucash/trunk/src/app-utils/gnc-gconf-utils.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-gconf-utils.h 2013-10-07 14:01:35 UTC (rev 23210)
+++ gnucash/trunk/src/app-utils/gnc-gconf-utils.h 2013-10-07 14:01:51 UTC (rev 23211)
@@ -65,7 +65,6 @@
#define KEY_ACCOUNT_SEPARATOR "account_separator"
#define KEY_NEGATIVE_IN_RED "negative_in_red"
#define KEY_NUM_SOURCE "num_source"
-#define KEY_ENABLE_EURO "enable_euro"
#define KEY_DATE_FORMAT "date_format"
#define KEY_DATE_COMPLETION "date_completion"
#define KEY_DATE_BACKMONTHS "date_backmonths"
Modified: gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas.in
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas.in 2013-10-07 14:01:35 UTC (rev 23210)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas.in 2013-10-07 14:01:51 UTC (rev 23211)
@@ -80,19 +80,6 @@
</schema>
<schema>
-
- <key>/schemas/apps/gnucash/general/enable_euro</key>
- <applyto>/apps/gnucash/general/enable_euro</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Enables Euro support</short>
- <long>Enables additional support for the European Union EURO currency.</long>
- </locale>
- </schema>
-
- <schema>
<key>/schemas/apps/gnucash/general/auto_decimal_point</key>
<applyto>/apps/gnucash/general/auto_decimal_point</applyto>
<owner>gnucash</owner>
Modified: gnucash/trunk/src/gnome-utils/window-main-summarybar.c
===================================================================
--- gnucash/trunk/src/gnome-utils/window-main-summarybar.c 2013-10-07 14:01:35 UTC (rev 23210)
+++ gnucash/trunk/src/gnome-utils/window-main-summarybar.c 2013-10-07 14:01:51 UTC (rev 23211)
@@ -84,7 +84,6 @@
typedef struct
{
gnc_commodity *default_currency;
- gboolean euro;
gboolean grand_total;
gboolean non_currency;
time64 start_date;
@@ -134,9 +133,7 @@
gnc_numeric end_amount_default_currency;
GNCAccountType account_type;
gnc_commodity * account_currency;
- gnc_commodity * euro_commodity;
GNCCurrencyAcc *currency_accum = NULL;
- GNCCurrencyAcc *euro_accum = NULL;
GNCCurrencyAcc *grand_total_accum = NULL;
GNCCurrencyAcc *non_curr_accum = NULL;
GList *children, *node;
@@ -159,16 +156,6 @@
options.default_currency,
TOTAL_GRAND_TOTAL);
- if (options.euro)
- {
- euro_commodity = gnc_get_euro ();
- euro_accum = gnc_ui_get_currency_accumulator(currency_list,
- euro_commodity,
- TOTAL_CURR_TOTAL);
- }
- else
- euro_commodity = NULL;
-
if (!gnc_commodity_is_currency(account_currency))
{
non_currency = TRUE;
@@ -226,15 +213,6 @@
GNC_HOW_RND_ROUND_HALF_UP);
}
- if (options.euro && (currency_accum != euro_accum))
- {
- euro_accum->assets =
- gnc_numeric_add (euro_accum->assets,
- gnc_convert_to_euro(account_currency, end_amount),
- gnc_commodity_get_fraction (euro_commodity),
- GNC_HOW_RND_ROUND_HALF_UP);
- }
-
gnc_ui_accounts_recurse(account, currency_list, options);
break;
case ACCT_TYPE_INCOME:
@@ -290,20 +268,6 @@
GNC_HOW_RND_ROUND_HALF_UP);
}
- if (options.euro && (currency_accum != euro_accum))
- {
- euro_accum->profits =
- gnc_numeric_add (euro_accum->profits,
- gnc_convert_to_euro(account_currency, start_amount),
- gnc_commodity_get_fraction (euro_commodity),
- GNC_HOW_RND_ROUND_HALF_UP);
- euro_accum->profits =
- gnc_numeric_sub (euro_accum->profits,
- gnc_convert_to_euro(account_currency, end_amount),
- gnc_commodity_get_fraction (euro_commodity),
- GNC_HOW_RND_ROUND_HALF_UP);
- }
-
gnc_ui_accounts_recurse(account, currency_list, options);
break;
case ACCT_TYPE_EQUITY:
@@ -393,7 +357,6 @@
options.default_currency = gnc_default_currency ();
}
- options.euro = gnc_gconf_get_bool(GCONF_GENERAL, KEY_ENABLE_EURO, NULL);
options.grand_total =
gnc_gconf_get_bool(GCONF_SECTION, KEY_GRAND_TOTAL, NULL);
options.non_currency =
More information about the gnucash-changes
mailing list