r14701 - gnucash/trunk - Remove some conditional code that is no longer compiled, or shouldn't

[David Hampton]

Author: hampton
Date: 2006-08-20 17:57:33 -0400 (Sun, 20 Aug 2006)
New Revision: 14701
Trac: http://svn.gnucash.org/trac/changeset/14701

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/backend/file/gnc-account-xml-v2.c
   gnucash/trunk/src/backend/file/gnc-commodity-xml-v2.c
   gnucash/trunk/src/gnome/top-level.c
Log:
Remove some conditional code that is no longer compiled, or shouldn't
be compiled in 2.2.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-08-20 21:52:04 UTC (rev 14700)
+++ gnucash/trunk/ChangeLog	2006-08-20 21:57:33 UTC (rev 14701)
@@ -1,5 +1,10 @@
 2006-08-20  David Hampton  <hampton at employees.org>
 
+	* src/backend/file/gnc-account-xml-v2.c:
+	* src/backend/file/gnc-commodity-xml-v2.c:
+	* src/gnome/top-level.c: Remove some conditional code that is no
+	longer compiled, or shouldn't be compiled in 2.2.
+
 	* src/gnome/gnc-plugin-page-account-tree.c: Maintain the account
 	hierarchy when reparenting the descendants of a deleted account.
 

Modified: gnucash/trunk/src/backend/file/gnc-account-xml-v2.c
===================================================================
--- gnucash/trunk/src/backend/file/gnc-account-xml-v2.c	2006-08-20 21:52:04 UTC (rev 14700)
+++ gnucash/trunk/src/backend/file/gnc-account-xml-v2.c	2006-08-20 21:57:33 UTC (rev 14701)
@@ -117,42 +117,6 @@
     if(kf)
     {
         xmlNodePtr kvpnode = kvp_frame_to_dom_tree(act_slots_string, kf);
-#if ((GNUCASH_MAJOR_VERSION == 1) && (GNUCASH_MINOR_VERSION < 10))
-	{
-	  /* Temporary backwards compatability hack. Create kvp slot
-	   * information for the stock quote data in case the user has
-	   * to fall back to the production code. */
-	  xmlNodePtr slot_node, val_node;
-	  gnc_commodity *com;
-	  gnc_quote_source *source;
-	  const gchar *tz;
-
-	  com = xaccAccountGetCommodity(act);
-	  if (com &&
-	      (!gnc_commodity_is_iso(com) ||
-	       xaccAccountGetType(act) == ACCT_TYPE_CURRENCY) &&
-	      gnc_commodity_get_quote_flag(com)) {
-	    if (!kvpnode)
-	      kvpnode= xmlNewNode(NULL, BAD_CAST act_slots_string);
-
-	    slot_node = xmlNewChild(kvpnode, NULL, BAD_CAST "slot", NULL);
-	    xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:key", BAD_CAST "old-price-source");
-
-	    source = gnc_commodity_get_quote_source(com);
-	    val_node = xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:value",
-				       BAD_CAST gnc_quote_source_get_old_internal_name(source));
-	    xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "string");
-
-	    tz = gnc_commodity_get_quote_tz(com);
-	    if (tz) {
-	      slot_node = xmlNewChild(kvpnode, NULL, BAD_CAST "slot", NULL);
-	      xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:key", BAD_CAST "old-quote-tz");
-	      val_node = xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:value", BAD_CAST tz);
-	      xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "string");
-	    }
-	  }
-	}
-#endif
         if(kvpnode)
         {
             xmlAddChild(ret, kvpnode);

Modified: gnucash/trunk/src/backend/file/gnc-commodity-xml-v2.c
===================================================================
--- gnucash/trunk/src/backend/file/gnc-commodity-xml-v2.c	2006-08-20 21:52:04 UTC (rev 14700)
+++ gnucash/trunk/src/backend/file/gnc-commodity-xml-v2.c	2006-08-20 21:57:33 UTC (rev 14701)
@@ -79,13 +79,7 @@
     xmlAddChild(ret, text_to_dom_tree(cmdty_id,
                                       gnc_commodity_get_mnemonic(com)));
 
-    /* Enforce backward compatability with 1.8 for the 1.9/2.0 release
-     * series. */
-    if (
-#if (GNUCASH_MAJOR_VERSION < 2) || ((GNUCASH_MAJOR_VERSION == 2) && (GNUCASH_MINOR_VERSION == 0))
-	TRUE ||
-#endif
-	!currency) {
+    if (!currency) {
       if(gnc_commodity_get_fullname(com))
       {
       	  xmlAddChild(ret, text_to_dom_tree(cmdty_name,

Modified: gnucash/trunk/src/gnome/top-level.c
===================================================================
--- gnucash/trunk/src/gnome/top-level.c	2006-08-20 21:52:04 UTC (rev 14700)
+++ gnucash/trunk/src/gnome/top-level.c	2006-08-20 21:57:33 UTC (rev 14701)
@@ -244,19 +244,7 @@
 
     if (!keyfile) {
         gnc_main_window_restore_default_state();
-        
-#if (GNUCASH_MAJOR_VERSION < 2) || ((GNUCASH_MAJOR_VERSION == 2) && (GNUCASH_MINOR_VERSION == 0))
-        /* See if there's an old style state file to be found */
-        scm_call_1(scm_c_eval_string("gnc:main-window-book-open-handler"),
-                   (session ? gw_wcp_assimilate_ptr(
-                        session, scm_c_eval_string("<gnc:Session*>")) :
-                    SCM_BOOL_F));
-        /* At this point the reports have only been loaded into
-           memory.  Now we create their ui component. */
-        gnc_reports_show_all(session);
-#endif
-        
-        LEAVE("old");
+        LEAVE("no state file");
         return;
     }