[Gnucash-changes] r12325 - gnucash/branches/cashutil - removing engine module and improving splash screen load

Neil Williams codehelp at cvs.gnucash.org
Wed Jan 11 13:46:24 EST 2006


Author: codehelp
Date: 2006-01-11 13:46:20 -0500 (Wed, 11 Jan 2006)
New Revision: 12325
Trac: http://svn.gnucash.org/trac/changeset/12325

Modified:
   gnucash/branches/cashutil/cashutil/src/Makefile.am
   gnucash/branches/cashutil/cashutil/src/cashutil.c
   gnucash/branches/cashutil/configure.ac
   gnucash/branches/cashutil/src/Makefile.am
   gnucash/branches/cashutil/src/app-utils/Makefile.am
   gnucash/branches/cashutil/src/app-utils/gncmod-app-utils.c
   gnucash/branches/cashutil/src/bin/gnucash2.c
   gnucash/branches/cashutil/src/engine/Makefile.am
   gnucash/branches/cashutil/src/engine/test/Makefile.am
   gnucash/branches/cashutil/src/gnc-module/Makefile.am
   gnucash/branches/cashutil/src/gnc-module/gnc-module.c
   gnucash/branches/cashutil/src/gnc-module/gnc-module.h
   gnucash/branches/cashutil/src/gnome-search/gncmod-gnome-search.c
   gnucash/branches/cashutil/src/gnome-utils/gncmod-gnome-utils.c
   gnucash/branches/cashutil/src/gnome/gncmod-budget.c
   gnucash/branches/cashutil/src/import-export/binary-import/gncmod-binary-import.c
   gnucash/branches/cashutil/src/import-export/gncmod-generic-import.c
   gnucash/branches/cashutil/src/import-export/hbci/gncmod-hbci.c
   gnucash/branches/cashutil/src/import-export/log-replay/gncmod-log-replay.c
   gnucash/branches/cashutil/src/import-export/mt940/gncmod-mt940-import.c
   gnucash/branches/cashutil/src/import-export/ofx/gncmod-ofx-import.c
   gnucash/branches/cashutil/src/import-export/qif-import/gncmod-qif-import.c
   gnucash/branches/cashutil/src/register/ledger-core/gncmod-ledger-core.c
   gnucash/branches/cashutil/src/register/register-core/gncmod-register-core.c
   gnucash/branches/cashutil/src/report/report-system/gncmod-report-system.c
Log:
removing engine module and improving splash screen load

Modified: gnucash/branches/cashutil/cashutil/src/Makefile.am
===================================================================
--- gnucash/branches/cashutil/cashutil/src/Makefile.am	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/cashutil/src/Makefile.am	2006-01-11 18:46:20 UTC (rev 12325)
@@ -5,6 +5,7 @@
   -I../../src/backend/file \
   -I../../src/business/business-core \
   -I../../src/engine \
+  -I../../src/gnc-module \
   ${GOBJECT_CFLAGS} \
   ${GLIB_CFLAGS}  \
   ${QOF_CFLAGS}

Modified: gnucash/branches/cashutil/cashutil/src/cashutil.c
===================================================================
--- gnucash/branches/cashutil/cashutil/src/cashutil.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/cashutil/src/cashutil.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -95,6 +95,7 @@
 #include "qofundo-p.h"
 #include "backend-bus.h"
 
+#define GNC_MODULE_LOG "gnucash-modules"
 static QofLogModule log_module = CU_MOD_CLI;
 static gboolean debug_on = FALSE;
 static GHashTable *backend_extensions;
@@ -155,13 +156,11 @@
 	typedef void (* bus_backend_init) (void);
 	GModule *bus_backend;
 	gchar *fullpath;
-	struct stat sbuf;
 	bus_backend_init bus_init;
 	gpointer g;
 
 	g_return_val_if_fail(g_module_supported(), FALSE);
-	fullpath = g_module_build_path(directory, "libgnc-backend-bus.la");
-	g_return_val_if_fail((stat(fullpath, &sbuf) == 0), FALSE);
+	fullpath = g_module_build_path(directory, "libgnc-backend-bus");
 	bus_backend = g_module_open(fullpath, G_MODULE_BIND_LAZY);
 	if(!bus_backend) { 
 		PWARN ("%s: %s\n", PACKAGE, g_module_error ()); 
@@ -359,6 +358,7 @@
 		gnc_set_log_level(CU_MOD_CLI, GNC_LOG_DETAIL);
 		gnc_set_log_level(QOF_MAIN_CLI, GNC_LOG_DETAIL);
 		gnc_set_log_level(QOF_MOD_QSF, GNC_LOG_DETAIL);
+		qof_log_set_level(GNC_MODULE_LOG, QOF_LOG_DETAIL);
 	}
 	g_return_val_if_fail((qof_load_backend_library 
 		(QOF_LIB_DIR, QSF_BACKEND_LIB, QSF_MODULE_INIT)), -1);

Modified: gnucash/branches/cashutil/configure.ac
===================================================================
--- gnucash/branches/cashutil/configure.ac	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/configure.ac	2006-01-11 18:46:20 UTC (rev 12325)
@@ -1309,6 +1309,8 @@
 AC_SUBST(GNC_SCM_INSTALL_DIR)
 AC_SUBST(GNC_SHAREDIR)
 AC_SUBST(GNC_LIBEXECDIR)
+AC_SUBST(GNC_CONFIGDIR)
+AC_SUBST(GNC_SHAREDIR)
 
 AC_ARG_ENABLE( debug,
   [  --enable-debug               compile with debugging flags set],
@@ -1879,7 +1881,7 @@
 ### GnuCash flags and libs configuration
 
 GNUCASH_ENGINE_BASE_LIBS="${GLIB_LIBS}"
-GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} -L${GNC_GWRAP_LIBDIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgw-engine -lgw-kvp -lgncmodule"
+GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} -L${GNC_GWRAP_LIBDIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgw-engine -lgw-kvp -lgncmodule"
 
 GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS}"
 GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS} ${GUILE_INCS}"

Modified: gnucash/branches/cashutil/src/Makefile.am
===================================================================
--- gnucash/branches/cashutil/src/Makefile.am	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/Makefile.am	2006-01-11 18:46:20 UTC (rev 12325)
@@ -24,7 +24,7 @@
   business \
   optional 
 
-DIST_SUBDIRS = $(NONGUI_SUBDIRS) $(GUI_SUBDIRS_1) bin report $(GUI_SUBDIRS_2)
+DIST_SUBDIRS = $(NONGUI_SUBDIRS) $(GUI_SUBDIRS_1) report $(GUI_SUBDIRS_2) bin
 
 if GNUCASH_ENABLE_GUI
 SUBDIRS = $(DIST_SUBDIRS)

Modified: gnucash/branches/cashutil/src/app-utils/Makefile.am
===================================================================
--- gnucash/branches/cashutil/src/app-utils/Makefile.am	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/app-utils/Makefile.am	2006-01-11 18:46:20 UTC (rev 12325)
@@ -70,7 +70,6 @@
 
 libgncmod_app_utils_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/engine/libcashobjects.la \
   ${top_builddir}/src/calculation/libgncmod-calculation.la \
   ${top_builddir}/src/core-utils/libcore-utils.la \

Modified: gnucash/branches/cashutil/src/app-utils/gncmod-app-utils.c
===================================================================
--- gnucash/branches/cashutil/src/app-utils/gncmod-app-utils.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/app-utils/gncmod-app-utils.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -52,10 +52,10 @@
 libgncmod_app_utils_LTX_gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+/*  if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
-
+*/
   /* load the calculation module (we depend on it) */
   if(!gnc_module_load("gnucash/calculation", 0)) {
     return FALSE;

Modified: gnucash/branches/cashutil/src/bin/gnucash2.c
===================================================================
--- gnucash/branches/cashutil/src/bin/gnucash2.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/bin/gnucash2.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -48,6 +48,7 @@
 #define GNC_QOF_LOG "/tmp/gnucash.trace"
 #define GNC_LIB_NAME "libgnc-backend-file.la"
 #define GNC_LIB_INIT "gnc_provider_init"
+#define GNC_MODULE_LOG "gnucash-modules"
 
 /* used to print debug logs. */
 static QofLogModule log_module = GNC_MOD_CLI;
@@ -80,13 +81,11 @@
 	typedef void (* bus_backend_init) (void);
 	GModule *bus_backend;
 	gchar *fullpath;
-	struct stat sbuf;
 	bus_backend_init bus_init;
 	gpointer g;
 
 	g_return_val_if_fail(g_module_supported(), FALSE);
-	fullpath = g_module_build_path(directory, "libgnc-backend-bus.la");
-	g_return_val_if_fail((stat(fullpath, &sbuf) == 0), FALSE);
+	fullpath = g_module_build_path(directory, "libgnc-backend-bus");
 	bus_backend = g_module_open(fullpath, G_MODULE_BIND_LAZY);
 	if(!bus_backend) { 
 		PWARN ("%s: %s\n", PACKAGE, g_module_error ()); 
@@ -126,14 +125,14 @@
 static void
 build_environment(void)
 {
-	gchar *gmp, *llp, *glp, *ltdlp;
+	gchar *gmp, *llp, *glibp, *ltdlp;
 
 	gmp = g_strconcat(LIBDIR, "/gnucash:", 
 		DATADIR, "/guile-modules:",
 		DATADIR, "/scm:", 
 		getenv("GNC_MODULE_PATH"), 
 		NULL);
-	glp = g_strconcat(DATADIR, "/guile-modules:",
+	glibp = g_strconcat(DATADIR, "/guile-modules:",
 		DATADIR, "/scm:",
 		getenv("GUILE_LOAD_PATH"), 
 		NULL);
@@ -144,23 +143,32 @@
 		getenv("LTDL_LIBRARY_PATH"), NULL);
 	setenv("GNC_MODULE_PATH", gmp, 1);
 	setenv("LD_LIBRARY_PATH", llp, 1);
-	setenv("GUILE_LOAD_PATH", glp, 1);
+	setenv("GUILE_LOAD_PATH", glibp, 1);
 	setenv("LTDL_LIBRARY_PATH", ltdlp, 1);
 	g_message ("set GNC_MODULE_PATH %s LD_LIBRARY_PATH %s"
-		" GUILE_LOAD_PATH %s LTDL_LIBRARY_PATH %s", gmp, llp, glp, ltdlp);
+		" GUILE_LOAD_PATH %s LTDL_LIBRARY_PATH %s", gmp, llp, glibp, ltdlp);
 }
 
 static void
 guile_main(void *closure, int argc, char ** argv)
 {
+
+}
+
+static int
+qof_cmd_gui(int argc, char ** argv)
+{
 	GnomeProgram *gnucash2;
+	GncMainWindow *gnc_win2;
 
+	gtk_init (&argc, &argv);
 	build_environment();
-	gtk_set_locale ();
-	gtk_init (&argc, &argv);
 	gnucash2 = gnome_program_init(PACKAGE, VERSION,
 		LIBGNOMEUI_MODULE, argc, argv, 
-		GNOME_PROGRAM_STANDARD_PROPERTIES, 
+		GNOME_PARAM_APP_PREFIX, PREFIX,
+		GNOME_PARAM_APP_SYSCONFDIR, SYSCONFDIR,
+		GNOME_PARAM_APP_DATADIR, DATADIR,
+		GNOME_PARAM_APP_LIBDIR, GNC_LIBDIR,
 		GNOME_PARAM_NONE);
 	gnome_program_postinit(gnucash2);
 	gnc_module_system_init();
@@ -200,6 +208,7 @@
 		gchar *last_file;
 
 		last_file = gnc_history_get_last();
+		gnc_update_splash_screen(_("Loading data... "));
 		gnc_file_open_file(last_file);
 	}
 	/** \todo Replace this scheme:
@@ -215,12 +224,12 @@
              (begin
                 (gnc:destroy-splash-screen)
                 (gnc:new-user-dialog))
-              (begin
-                (gnc:destroy-splash-screen)
-                (gnc:main-window-set-progressbar-window main-window)
-                (gnc:load-account-file)
 	*/
+	gnc_win2 = gnc_main_window_new();
+	gnc_main_window_set_progressbar_window(gnc_win2);
 	gnc_destroy_splash_screen();
+	scm_boot_guile(argc, (char **)argv, guile_main, NULL);
+	return 0;
 }
 
 int
@@ -358,6 +367,7 @@
 				qof_log_set_level(QOF_MAIN_CLI, QOF_LOG_DETAIL);
 				qof_log_set_level(QOF_MOD_QSF, QOF_LOG_DETAIL);
 				qof_log_set_level(GNC_MOD_CLI, QOF_LOG_DETAIL);
+				qof_log_set_level(GNC_MODULE_LOG, QOF_LOG_DETAIL);
 				debug_on = TRUE;
 				break;
 			}
@@ -415,7 +425,7 @@
 		case qof_op_guile :
 		{
 			/* load guile here */
-			scm_boot_guile(argc, (char **)argv, guile_main, NULL);
+			qof_cmd_gui(argc, (char**)argv);
 			break;
 		}
 		default:
@@ -430,6 +440,3 @@
 	qof_close();
 	return EXIT_SUCCESS;
 }
-
-
-

Modified: gnucash/branches/cashutil/src/engine/Makefile.am
===================================================================
--- gnucash/branches/cashutil/src/engine/Makefile.am	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/engine/Makefile.am	2006-01-11 18:46:20 UTC (rev 12325)
@@ -43,13 +43,10 @@
 
 libgncmod_engine_la_SOURCES = \
   gnc-associate-account.c \
-  gnc-budget.c \
   gnc-engine.c \
   gnc-hooks.c \
-  gnc-lot.c \
   gnc-session-scm.c \
-  gncmod-engine.c \
-  policy.c
+  gncmod-engine.c
 
 EXTRA_libcashobjects_la_SOURCES = iso-4217-currencies.c
 

Modified: gnucash/branches/cashutil/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/cashutil/src/engine/test/Makefile.am	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/engine/test/Makefile.am	2006-01-11 18:46:20 UTC (rev 12325)
@@ -14,7 +14,6 @@
   ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${top_builddir}/src/test-core/libgncmod-test.la \
   ${top_builddir}/src/engine/libcashobjects.la \
-  ../libgncmod-engine.la \
   ../libgw-engine.la \
   ../libgw-kvp.la \
   ../test-core/libgncmod-test-engine.la \
@@ -85,7 +84,7 @@
   test-transaction-voiding
 
 test_link_SOURCES = test-link.c
-test_link_LDADD = ../libcashobjects.la ../libgncmod-engine.la ${QOF_LIBS}
+test_link_LDADD = ../libcashobjects.la ${QOF_LIBS}
 
 EXTRA_DIST = \
   test-create-account \

Modified: gnucash/branches/cashutil/src/gnc-module/Makefile.am
===================================================================
--- gnucash/branches/cashutil/src/gnc-module/Makefile.am	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/gnc-module/Makefile.am	2006-01-11 18:46:20 UTC (rev 12325)
@@ -4,6 +4,7 @@
    -I${top_srcdir}/lib/libc \
    -I${top_srcdir}/src \
    -I${top_srcdir}/src/core-utils \
+   ${QOF_CFLAGS} \
    ${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_INCS}
 
 lib_LTLIBRARIES = libgncmodule.la 
@@ -16,6 +17,7 @@
   ${G_WRAP_LINK_ARGS} \
   ${top_builddir}/lib/libc/libc-missing.la \
   ${GLIB_LIBS} \
+  ${QOF_LIBS} \
   -lltdl
 
 libgw_gnc_module_la_SOURCES = gw-gnc-module.c

Modified: gnucash/branches/cashutil/src/gnc-module/gnc-module.c
===================================================================
--- gnucash/branches/cashutil/src/gnc-module/gnc-module.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/gnc-module/gnc-module.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -13,6 +13,7 @@
 #include <guile/gh.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <qof.h>
 
 #ifndef HAVE_SETENV
 #include "setenv.h"
@@ -23,6 +24,10 @@
 static GHashTable * loaded_modules = NULL;
 static GList      * module_info = NULL;
 
+/* now that engine is not a gnc-module, we can use the
+engine to debug the modules! */
+static QofLogModule log_module = GNC_MODULE_LOG;
+
 typedef struct 
 {
   lt_dlhandle   handle;
@@ -135,7 +140,7 @@
     
     if(setenv("LD_LIBRARY_PATH", envt, 1) != 0)
     {
-      g_warning ("gnc-module failed to set LD_LIBRARY_PATH");
+      PERR ("gnc-module failed to set LD_LIBRARY_PATH");
     }
     g_free(envt);
   }
@@ -162,8 +167,7 @@
     }
     else
     {
-      /* FIXME: there's no way to report this error to the caller. */
-      g_warning ("gnc module system couldn't initialize libltdl");
+      PERR ("gnc module system couldn't initialize libltdl");
     }
   }
 }
@@ -237,6 +241,7 @@
 	GList *iter;
 	GNCModuleInfo *info;
 
+	ENTER (" ");
 	gnc_module_system_refresh();
 	iter = g_list_copy(module_info);
 	for(iter = g_list_reverse(iter); iter; iter=iter->next)
@@ -245,6 +250,7 @@
 		gnc_module_load(info->module_path, interface);
 	}
 	g_list_free(iter);
+	LEAVE (" ");
 }
 
 /*************************************************************

Modified: gnucash/branches/cashutil/src/gnc-module/gnc-module.h
===================================================================
--- gnucash/branches/cashutil/src/gnc-module/gnc-module.h	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/gnc-module/gnc-module.h	2006-01-11 18:46:20 UTC (rev 12325)
@@ -62,6 +62,9 @@
 /** the current gnc-module interface version. */
 #define GNC_MOD_INTERFACE_VERSION 0
 
+/** the QofLogModule for the gnc_modules */
+#define GNC_MODULE_LOG "gnucash-modules"
+
 /** the basics: initialize the module system, refresh its module 
  * database, and get a list of all known modules */
 void            gnc_module_system_init(void);

Modified: gnucash/branches/cashutil/src/gnome/gncmod-budget.c
===================================================================
--- gnucash/branches/cashutil/src/gnome/gncmod-budget.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/gnome/gncmod-budget.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -56,10 +56,10 @@
 int libgncmod_budget_gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+/*  if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
-
+*/
   /* Add menu items with C callbacks */
   gnc_plugin_budget_create_plugin();
 

Modified: gnucash/branches/cashutil/src/gnome-search/gncmod-gnome-search.c
===================================================================
--- gnucash/branches/cashutil/src/gnome-search/gncmod-gnome-search.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/gnome-search/gncmod-gnome-search.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -66,10 +66,10 @@
 libgncmod_gnome_search_LTX_gnc_module_init(int refcount) 
 {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+/*  if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
-
+*/
   if (!gnc_module_load("gnucash/gnome-utils", 0)) {
     return FALSE;
   }

Modified: gnucash/branches/cashutil/src/gnome-utils/gncmod-gnome-utils.c
===================================================================
--- gnucash/branches/cashutil/src/gnome-utils/gncmod-gnome-utils.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/gnome-utils/gncmod-gnome-utils.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -61,10 +61,10 @@
 int
 libgncmod_gnome_utils_LTX_gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+/*  if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
-
+*/
   /* load the calculation module (we depend on it) */
   if(!gnc_module_load("gnucash/calculation", 0)) {
     return FALSE;

Modified: gnucash/branches/cashutil/src/import-export/binary-import/gncmod-binary-import.c
===================================================================
--- gnucash/branches/cashutil/src/import-export/binary-import/gncmod-binary-import.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/import-export/binary-import/gncmod-binary-import.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -43,10 +43,10 @@
 int
 libgncmod_binary_import_LTX_gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+/*  if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
-
+*/
   /* load the calculation module (we depend on it) */
   if(!gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;

Modified: gnucash/branches/cashutil/src/import-export/gncmod-generic-import.c
===================================================================
--- gnucash/branches/cashutil/src/import-export/gncmod-generic-import.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/import-export/gncmod-generic-import.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -43,10 +43,10 @@
 int
 libgncmod_generic_import_LTX_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+/*  if(!gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
-  }
+  }*/
   if(!gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;

Modified: gnucash/branches/cashutil/src/import-export/hbci/gncmod-hbci.c
===================================================================
--- gnucash/branches/cashutil/src/import-export/hbci/gncmod-hbci.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/import-export/hbci/gncmod-hbci.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -48,10 +48,10 @@
 libgncmod_hbci_LTX_gnc_module_init(int refcount) 
 {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+/*  if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
-
+*/
   /* load the app-utils (we depend on it) */
   if(!gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;

Modified: gnucash/branches/cashutil/src/import-export/log-replay/gncmod-log-replay.c
===================================================================
--- gnucash/branches/cashutil/src/import-export/log-replay/gncmod-log-replay.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/import-export/log-replay/gncmod-log-replay.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -64,10 +64,10 @@
 int
 libgncmod_log_replay_LTX_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+/*  if(!gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
-  }
+  }*/
   if(!gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;

Modified: gnucash/branches/cashutil/src/import-export/mt940/gncmod-mt940-import.c
===================================================================
--- gnucash/branches/cashutil/src/import-export/mt940/gncmod-mt940-import.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/import-export/mt940/gncmod-mt940-import.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -62,10 +62,10 @@
 int
 libgncmod_mt940_LTX_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+/*  if(!gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
-  }
+  }*/
   if(!gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;

Modified: gnucash/branches/cashutil/src/import-export/ofx/gncmod-ofx-import.c
===================================================================
--- gnucash/branches/cashutil/src/import-export/ofx/gncmod-ofx-import.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/import-export/ofx/gncmod-ofx-import.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -63,10 +63,10 @@
 int
 libgncmod_ofx_LTX_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+/*  if(!gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
-  }
+  }*/
   if(!gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;

Modified: gnucash/branches/cashutil/src/import-export/qif-import/gncmod-qif-import.c
===================================================================
--- gnucash/branches/cashutil/src/import-export/qif-import/gncmod-qif-import.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/import-export/qif-import/gncmod-qif-import.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -46,11 +46,11 @@
 int
 libgncmod_qif_import_LTX_gnc_module_init(int refcount) 
 {
-  if(!gnc_module_load("gnucash/engine", 0)) 
+/*  if(!gnc_module_load("gnucash/engine", 0)) 
   {
     return FALSE;
   }
-
+*/
   if(!gnc_module_load("gnucash/app-utils", 0)) 
   {
     return FALSE;

Modified: gnucash/branches/cashutil/src/register/ledger-core/gncmod-ledger-core.c
===================================================================
--- gnucash/branches/cashutil/src/register/ledger-core/gncmod-ledger-core.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/register/ledger-core/gncmod-ledger-core.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -36,11 +36,11 @@
 
 int
 libgncmod_ledger_core_LTX_gnc_module_init(int refcount) {
-  if(!gnc_module_load("gnucash/engine", 0)) 
+/*  if(!gnc_module_load("gnucash/engine", 0)) 
   {
     return FALSE;
   }
-
+*/
   if(!gnc_module_load("gnucash/register/register-core", 0)) 
   {
     return FALSE;

Modified: gnucash/branches/cashutil/src/register/register-core/gncmod-register-core.c
===================================================================
--- gnucash/branches/cashutil/src/register/register-core/gncmod-register-core.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/register/register-core/gncmod-register-core.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -47,11 +47,11 @@
 int
 libgncmod_register_core_LTX_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0)) 
+/*  if(!gnc_module_load("gnucash/engine", 0)) 
   {
     return FALSE;
   }
-
+*/
   /* FIXME. We need this for the wide-character functions.
    * When fixing, get rid of gnome-utils includes, too. */
   if(!gnc_module_load("gnucash/gnome-utils", 0)) 

Modified: gnucash/branches/cashutil/src/report/report-system/gncmod-report-system.c
===================================================================
--- gnucash/branches/cashutil/src/report/report-system/gncmod-report-system.c	2006-01-11 13:26:15 UTC (rev 12324)
+++ gnucash/branches/cashutil/src/report/report-system/gncmod-report-system.c	2006-01-11 18:46:20 UTC (rev 12325)
@@ -49,10 +49,10 @@
 int
 libgncmod_report_system_LTX_gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+/*  if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
-
+*/
   if(!gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
   }



More information about the gnucash-changes mailing list