r16757 - gnucash/branches/gda-dev2/src - 1) In gnc-backend-gda.c, change a g_return_if_fail() to a regular

[Phil Longstaff]

Author: plongstaff
Date: 2007-12-28 17:26:16 -0500 (Fri, 28 Dec 2007)
New Revision: 16757
Trac: http://svn.gnucash.org/trac/changeset/16757

Modified:
   gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c
   gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-gda.c
   gnucash/branches/gda-dev2/src/business/business-core/xml/gncmod-business-backend-xml.c
Log:
1) In gnc-backend-gda.c, change a g_return_if_fail() to a regular
if()return because it isn't a critical error condition.
2) In gnc-account-gda.c, remove some #if'ed out code
3) In gncmod-business-backend-xml.c, change the module name to
'gnucash/business-core-xml'.



Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c	2007-12-28 21:44:25 UTC (rev 16756)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c	2007-12-28 22:26:16 UTC (rev 16757)
@@ -195,29 +195,6 @@
 
         for( r = 0; r < numRows; r++ ) {
             pAccount = load_single_account( be, pModel, r, &l_accounts_needing_parents );
-
-#if 0
-            if( pAccount != NULL ) {
-
-                /* Backwards compatibility.  If there's no parent, see if
-                 * this account is of type ROOT.  If not, find or create a
-                 * ROOT account and make that the parent. */
-                parent = gnc_account_get_parent( pAccount );
-                if( parent == NULL ) {
-                    int type;
-
-                    type = xaccAccountGetType( pAccount );
-                    if( type != ACCT_TYPE_ROOT ) {
-                        Account* root;
-                        root = gnc_book_get_root_account( pBook );
-                        if( root == NULL ) {
-                            root = gnc_account_create_root( pBook );
-                        }
-                        gnc_account_append_child( root, pAccount ); 
-                    }
-                }
-            }
-#endif
         }
 
 		/* While there are items on the list of accounts needing parents,

Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-gda.c	2007-12-28 21:44:25 UTC (rev 16756)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-gda.c	2007-12-28 22:26:16 UTC (rev 16757)
@@ -870,10 +870,9 @@
 
     g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
     g_return_if_fail( pData->version == GNC_GDA_BACKEND_VERSION );
-    g_return_if_fail( strcmp( type, be_data->pQueryInfo->searchObj ) == 0 );
+    if( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
+    if( be_data->ok ) return;
 
-    g_return_if_fail( !be_data->ok );
-
     if( pData->free_query != NULL ) {
         (pData->free_query)( be_data->be, be_data->pCompiledQuery );
         be_data->ok = TRUE;

Modified: gnucash/branches/gda-dev2/src/business/business-core/xml/gncmod-business-backend-xml.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/xml/gncmod-business-backend-xml.c	2007-12-28 21:44:25 UTC (rev 16756)
+++ gnucash/branches/gda-dev2/src/business/business-core/xml/gncmod-business-backend-xml.c	2007-12-28 22:26:16 UTC (rev 16757)
@@ -60,7 +60,7 @@
 char *
 libgncmod_business_backend_xml_gnc_module_path(void)
 {
-  return g_strdup("gnucash/business-core-file");
+  return g_strdup("gnucash/business-core-xml");
 }
 
 char *