Remove obsolete enable_euro key from gconf

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23211 57a11ea4-9604-0410-9ed3-97b8803252fd
Gnucash · Oct 7, 2013 · 3861de6 · 3861de6
1 parent a050fcf
commit 3861de6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 51 deletions.
diff --git a/src/app-utils/gnc-gconf-utils.h b/src/app-utils/gnc-gconf-utils.h
@@ -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"

diff --git a/src/gnome-utils/window-main-summarybar.c b/src/gnome-utils/window-main-summarybar.c
@@ -84,7 +84,6 @@ typedef struct
 typedef struct
 {
     gnc_commodity *default_currency;
-    gboolean euro;
     gboolean grand_total;
     gboolean non_currency;
     time64 start_date;
@@ -134,9 +133,7 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
     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 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
                                 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_ui_accounts_recurse (Account *parent, GList **currency_list,
                                      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_ui_accounts_recurse (Account *parent, GList **currency_list,
                                      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 @@ gnc_main_window_summary_refresh (GNCMainSummary * summary)
         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 =

diff --git a/src/gnome/schemas/apps_gnucash_general.schemas.in b/src/gnome/schemas/apps_gnucash_general.schemas.in
@@ -79,19 +79,6 @@
       </locale>
     </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>