[Gnucash-changes] r14430 - gnucash/branches/register-rewrite/src/backend/file - Remove unnecessary code for fixing a now-impossible condition.

[Chris Shoemaker]

Author: chris
Date: 2006-06-24 17:01:29 -0400 (Sat, 24 Jun 2006)
New Revision: 14430
Trac: http://svn.gnucash.org/trac/changeset/14430

Modified:
   gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.c
Log:
   Remove unnecessary code for fixing a now-impossible condition.
   Commodities with a given namespace and mnemonic are now always unique.


Modified: gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.c
===================================================================
--- gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.c	2006-06-24 19:03:21 UTC (rev 14429)
+++ gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.c	2006-06-24 21:01:29 UTC (rev 14430)
@@ -120,41 +120,6 @@
     }
 }
 
-static void
-clear_up_transaction_commodity(
-    gnc_commodity_table *tbl, Transaction *trans,
-    gnc_commodity * (*getter) (const Transaction *trans),
-    void (*setter) (Transaction *trans, gnc_commodity *comm))
-{
-    gnc_commodity *gcom;
-    gnc_commodity *com = getter(trans);
-
-    if(!com)
-    {
-        return;
-    }
-    
-    gcom = gnc_commodity_table_lookup(tbl, gnc_commodity_get_namespace(com),
-                                      gnc_commodity_get_mnemonic(com));
-
-    if(gcom == com)
-    {
-        return;
-    }
-    else if(!gcom)
-    {
-        PWARN("unable to find global commodity for %s adding new",
-                  gnc_commodity_get_unique_name(com));
-    }
-    else
-    {
-        xaccTransBeginEdit(trans);
-        setter(trans, gcom);
-        xaccTransCommitEdit(trans);
-        gnc_commodity_destroy(com);
-    }
-}
-
 static gboolean
 add_account_local(sixtp_gdv2 *data, Account *act)
 {
@@ -214,10 +179,6 @@
     table = gnc_book_get_commodity_table (data->book);
 
     xaccTransBeginEdit (trn);
-    clear_up_transaction_commodity(table, trn,
-                                   xaccTransGetCurrency,
-                                   xaccTransSetCurrency);
-
     xaccTransScrubCurrency (trn);
 
     for(i = 0, spl = xaccTransGetSplit(trn, i);