[Gnucash-changes] r12326 - gnucash/branches/cashutil/src - one more
step to loading main window in C
Neil Williams
codehelp at cvs.gnucash.org
Wed Jan 11 17:05:38 EST 2006
Author: codehelp
Date: 2006-01-11 17:05:36 -0500 (Wed, 11 Jan 2006)
New Revision: 12326
Trac: http://svn.gnucash.org/trac/changeset/12326
Modified:
gnucash/branches/cashutil/src/backend/file/gncmod-backend-file.c
gnucash/branches/cashutil/src/bin/gnucash2.c
gnucash/branches/cashutil/src/business/business-core/file/gncmod-business-backend-file.c
gnucash/branches/cashutil/src/engine/gncmod-engine.c
gnucash/branches/cashutil/src/import-export/qif-io-core/gncmod-qifiocore.c
Log:
one more step to loading main window in C
Modified: gnucash/branches/cashutil/src/backend/file/gncmod-backend-file.c
===================================================================
--- gnucash/branches/cashutil/src/backend/file/gncmod-backend-file.c 2006-01-11 18:46:20 UTC (rev 12325)
+++ gnucash/branches/cashutil/src/backend/file/gncmod-backend-file.c 2006-01-11 22:05:36 UTC (rev 12326)
@@ -43,9 +43,9 @@
int
libgncmod_backend_file_LTX_gnc_module_init(int refcount)
{
- engine = gnc_module_load("gnucash/engine", 0);
+/* engine = gnc_module_load("gnucash/engine", 0);
if(!engine) return FALSE;
-
+*/
return TRUE;
}
Modified: gnucash/branches/cashutil/src/bin/gnucash2.c
===================================================================
--- gnucash/branches/cashutil/src/bin/gnucash2.c 2006-01-11 18:46:20 UTC (rev 12325)
+++ gnucash/branches/cashutil/src/bin/gnucash2.c 2006-01-11 22:05:36 UTC (rev 12326)
@@ -152,28 +152,8 @@
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();
- gnucash2 = gnome_program_init(PACKAGE, VERSION,
- LIBGNOMEUI_MODULE, argc, argv,
- 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();
- gnc_show_splash_screen();
- gnc_update_splash_screen(_("Loading modules... "));
/** autoloading.
Some may need to be loaded in sequence but each should
handle this internally - by calling it's own dependencies.
@@ -184,24 +164,6 @@
calling the old engine.
*/
gnc_module_load_all(GNC_MOD_INTERFACE_VERSION);
-/* gnc_module_load("gnucash/app-utils", 0);
- gnc_module_load("gnucash/import-export", 0);
- gnc_module_load("gnucash/register/ledger-core", 0);
- gnc_module_load("gnucash/register/register-core", 0);
- gnc_module_load("gnucash/register/register-gnome", 0);
- gnc_module_load("gnucash/import-export/binary-import", 0);
- gnc_module_load("gnucash/import-export/qif-import", 0);
- gnc_module_load("gnucash/import-export/ofx", 0);
- gnc_module_load("gnucash/import-export/mt940", 0);
- gnc_module_load("gnucash/import-export/log-replay", 0);
- gnc_module_load("gnucash/import-export/hbci", 0);
- gnc_module_load("gnucash/report/report-system", 0);
- gnc_module_load("gnucash/report/stylesheets", 0);
- gnc_module_load("gnucash/report/standard-reports", 0);
- gnc_module_load("gnucash/report/utility-reports", 0);
- gnc_module_load("gnucash/report/locale-specific/us", 0);
- gnc_module_load("gnucash/report/report-gnome", 0);
- gnc_module_load("gnucash/business-gnome", 0);*/
/* handle --no-file */
if(!skip_auto)
{
@@ -228,6 +190,27 @@
gnc_win2 = gnc_main_window_new();
gnc_main_window_set_progressbar_window(gnc_win2);
gnc_destroy_splash_screen();
+}
+
+static int
+qof_cmd_gui(int argc, char ** argv)
+{
+ GnomeProgram *gnucash2;
+
+ gtk_init (&argc, &argv);
+ build_environment();
+ gnucash2 = gnome_program_init(PACKAGE, VERSION,
+ LIBGNOMEUI_MODULE, argc, argv,
+ 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();
+ gnc_show_splash_screen();
+ gnc_update_splash_screen(_("Loading modules... "));
+ /* I only do this here because a module may call scm */
scm_boot_guile(argc, (char **)argv, guile_main, NULL);
return 0;
}
Modified: gnucash/branches/cashutil/src/business/business-core/file/gncmod-business-backend-file.c
===================================================================
--- gnucash/branches/cashutil/src/business/business-core/file/gncmod-business-backend-file.c 2006-01-11 18:46:20 UTC (rev 12325)
+++ gnucash/branches/cashutil/src/business/business-core/file/gncmod-business-backend-file.c 2006-01-11 22:05:36 UTC (rev 12326)
@@ -76,7 +76,7 @@
int
libgncmod_business_backend_file_LTX_gnc_module_init(int refcount)
{
- if(!gnc_engine_is_initialized()) { return FALSE; }
+/* if(!gnc_engine_is_initialized()) { return FALSE; }*/
bus_core = gnc_module_load("gnucash/business-core", 0);
if(!bus_core) return FALSE;
Modified: gnucash/branches/cashutil/src/engine/gncmod-engine.c
===================================================================
--- gnucash/branches/cashutil/src/engine/gncmod-engine.c 2006-01-11 18:46:20 UTC (rev 12325)
+++ gnucash/branches/cashutil/src/engine/gncmod-engine.c 2006-01-11 22:05:36 UTC (rev 12326)
@@ -44,9 +44,9 @@
int
libgncmod_engine_LTX_gnc_module_init(int refcount)
{
- if(refcount == 0)
+/* if(refcount == 0)
{
- /* initialize the engine on the first load */
+// initialize the engine on the first load
gnc_engine_init(0, NULL);
}
@@ -56,7 +56,7 @@
scm_c_eval_string("(use-modules (g-wrapped gw-kvp))");
scm_c_eval_string("(use-modules (g-wrapped gw-engine))");
-
+*/
return TRUE;
}
Modified: gnucash/branches/cashutil/src/import-export/qif-io-core/gncmod-qifiocore.c
===================================================================
--- gnucash/branches/cashutil/src/import-export/qif-io-core/gncmod-qifiocore.c 2006-01-11 18:46:20 UTC (rev 12325)
+++ gnucash/branches/cashutil/src/import-export/qif-io-core/gncmod-qifiocore.c 2006-01-11 22:05:36 UTC (rev 12326)
@@ -40,10 +40,10 @@
int
libgncmod_qifiocore_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 engine (we depend on it) */
if(!gnc_module_load("gnucash/app-utils", 0)) {
return FALSE;
More information about the gnucash-changes
mailing list