r15231 - gnucash/branches/reshuffle-modules - Remove all prefixes "libgncmod_my_mod_LTX_".

Andreas Köhler andi5 at cvs.gnucash.org
Tue Dec 19 04:06:29 EST 2006


Author: andi5
Date: 2006-12-19 04:06:23 -0500 (Tue, 19 Dec 2006)
New Revision: 15231
Trac: http://svn.gnucash.org/trac/changeset/15231

Modified:
   gnucash/branches/reshuffle-modules/
   gnucash/branches/reshuffle-modules/src/app-utils/gncmod-app-utils.c
   gnucash/branches/reshuffle-modules/src/backend/file/gncmod-backend-file.c
   gnucash/branches/reshuffle-modules/src/business/business-core/businessmod-core.c
   gnucash/branches/reshuffle-modules/src/business/business-core/file/gncmod-business-backend-file.c
   gnucash/branches/reshuffle-modules/src/business/business-gnome/businessmod-gnome.c
   gnucash/branches/reshuffle-modules/src/business/business-utils/gncmod-business-utils.c
   gnucash/branches/reshuffle-modules/src/business/dialog-tax-table/gncmod-dialog-tax-table.c
   gnucash/branches/reshuffle-modules/src/calculation/gncmod-calculation.c
   gnucash/branches/reshuffle-modules/src/engine/gncmod-engine.c
   gnucash/branches/reshuffle-modules/src/engine/test-core/gncmod-test-engine.c
   gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/agedver.c
   gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/futuremodsys.c
   gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/incompatdep.c
   gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-bar/gnc-mod-bar.c
   gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-baz/gnc-mod-baz.c
   gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-foo/gnc-mod-foo.c
   gnucash/branches/reshuffle-modules/src/gnome-search/gncmod-gnome-search.c
   gnucash/branches/reshuffle-modules/src/gnome-utils/gncmod-gnome-utils.c
   gnucash/branches/reshuffle-modules/src/import-export/binary-import/gncmod-binary-import.c
   gnucash/branches/reshuffle-modules/src/import-export/gncmod-generic-import.c
   gnucash/branches/reshuffle-modules/src/import-export/hbci/gncmod-hbci.c
   gnucash/branches/reshuffle-modules/src/import-export/log-replay/gncmod-log-replay.c
   gnucash/branches/reshuffle-modules/src/import-export/ofx/gncmod-ofx-import.c
   gnucash/branches/reshuffle-modules/src/import-export/qif-import/gncmod-qif-import.c
   gnucash/branches/reshuffle-modules/src/import-export/qif-io-core/gncmod-qifiocore.c
   gnucash/branches/reshuffle-modules/src/network-utils/gncmod-network-utils.c
   gnucash/branches/reshuffle-modules/src/register/ledger-core/gncmod-ledger-core.c
   gnucash/branches/reshuffle-modules/src/register/register-core/gncmod-register-core.c
   gnucash/branches/reshuffle-modules/src/register/register-gnome/gncmod-register-gnome.c
   gnucash/branches/reshuffle-modules/src/report/locale-specific/us/gncmod-locale-reports-us.c
   gnucash/branches/reshuffle-modules/src/report/report-gnome/gncmod-report-gnome.c
   gnucash/branches/reshuffle-modules/src/report/report-system/gncmod-report-system.c
   gnucash/branches/reshuffle-modules/src/report/standard-reports/gncmod-standard-reports.c
   gnucash/branches/reshuffle-modules/src/report/stylesheets/gncmod-stylesheets.c
   gnucash/branches/reshuffle-modules/src/report/utility-reports/gncmod-utility-reports.c
   gnucash/branches/reshuffle-modules/src/tax/us/gncmod-tax-us.c
   gnucash/branches/reshuffle-modules/src/test-core/gncmod-test.c
Log:
Remove all prefixes "libgncmod_my_mod_LTX_".




Property changes on: gnucash/branches/reshuffle-modules
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1003
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1004
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/branches/reshuffle-modules/src/app-utils/gncmod-app-utils.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/app-utils/gncmod-app-utils.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/app-utils/gncmod-app-utils.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,13 +1,12 @@
 /*********************************************************************
  * gncmod-app-utils.c
- * module definition/initialization for the report infrastructure 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the report infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
@@ -18,32 +17,26 @@
 #include "gnc-exp-parser.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_app_utils_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_app_utils_LTX_gnc_module_current  = 0;
-int libgncmod_app_utils_LTX_gnc_module_revision = 0;
-int libgncmod_app_utils_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_app_utils_LTX_gnc_module_path(void);
-char *libgncmod_app_utils_LTX_gnc_module_description(void);
-int libgncmod_app_utils_LTX_gnc_module_init(int refcount);
-int libgncmod_app_utils_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_app_utils_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/app-utils");
 }
 
-char * 
-libgncmod_app_utils_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Utilities for building gnc applications");
 }
 
 static void
-lmod(char * mn) 
+lmod(char * mn)
 {
   char * form = g_strdup_printf("(use-modules %s)\n", mn);
   scm_c_eval_string(form);
@@ -61,7 +54,7 @@
 extern SCM scm_init_sw_app_utils_module(void);
 
 int
-libgncmod_app_utils_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
@@ -89,7 +82,7 @@
 }
 
 int
-libgncmod_app_utils_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
 {
   if (refcount == 0)
     gnc_component_manager_shutdown ();

Modified: gnucash/branches/reshuffle-modules/src/backend/file/gncmod-backend-file.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/backend/file/gncmod-backend-file.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/backend/file/gncmod-backend-file.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,49 +1,43 @@
 /*********************************************************************
  * gncmod-file-backend.c
  * module definition/initialization for the file backend module
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include <stdio.h>
-#include <glib.h>
-#include <glib-gobject.h>
+#include <gmodule.h>
+/* #include <glib-gobject.h> */
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_backend_file_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_backend_file_LTX_gnc_module_current  = 0;
-int libgncmod_backend_file_LTX_gnc_module_revision = 0;
-int libgncmod_backend_file_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
 static GNCModule engine;
 
-/* forward references */
-char *libgncmod_backend_file_LTX_gnc_module_path(void);
-char *libgncmod_backend_file_LTX_gnc_module_description(void);
-int libgncmod_backend_file_LTX_gnc_module_init(int refcount);
-int libgncmod_backend_file_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_backend_file_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/backend/file");
 }
 
-char * 
-libgncmod_backend_file_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("The binary and XML (v1 and v2) backends for GnuCash");
 }
 
 int
-libgncmod_backend_file_LTX_gnc_module_init(int refcount) 
-{  
+gnc_module_init(int refcount)
+{
   engine = gnc_module_load("gnucash/engine", 0);
   if(!engine) return FALSE;
 
@@ -55,7 +49,7 @@
 }
 
 int
-libgncmod_backend_file_LTX_gnc_module_end(int refcount) 
+gnc_module_end(int refcount)
 {
   int unload = TRUE;
 

Modified: gnucash/branches/reshuffle-modules/src/business/business-core/businessmod-core.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/business/business-core/businessmod-core.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/business/business-core/businessmod-core.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,7 +1,7 @@
 /*********************************************************************
  * businessmod-core.c
  * module definition/initialization for the core Business module
- * 
+ *
  * Copyright (c) 2001 Derek Atkins <warlord at MIT.EDU>
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,7 @@
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
@@ -46,40 +45,35 @@
 extern SCM scm_init_sw_business_core_module (void);
 
 /* version of the gnc module system interface we require */
-int libgncmod_business_core_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_business_core_LTX_gnc_module_current  = 0;
-int libgncmod_business_core_LTX_gnc_module_revision = 0;
-int libgncmod_business_core_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_business_core_LTX_gnc_module_path(void);
-char *libgncmod_business_core_LTX_gnc_module_description(void);
-int libgncmod_business_core_LTX_gnc_module_init(int refcount);
-int libgncmod_business_core_LTX_gnc_module_end(int refcount);
 
 char *
-libgncmod_business_core_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/business-core");
 }
 
-char * 
-libgncmod_business_core_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("The GnuCash business core");
 }
 
 int
-libgncmod_business_core_LTX_gnc_module_init(int refcount) 
+gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
-  if(refcount == 0) 
+  if(refcount == 0)
   {
     /* initialize known types */
     gncInvoiceRegister ();
@@ -94,7 +88,7 @@
     gncTaxTableRegister ();
     gncVendorRegister ();
   }
-  
+
   scm_init_sw_business_core_module();
   scm_c_eval_string("(use-modules (sw_business_core))");
   scm_c_eval_string("(use-modules (gnucash business-core))");
@@ -103,6 +97,6 @@
 }
 
 int
-libgncmod_business_core_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/business/business-core/file/gncmod-business-backend-file.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/business/business-core/file/gncmod-business-backend-file.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/business/business-core/file/gncmod-business-backend-file.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,7 +1,7 @@
 /*********************************************************************
  * gncmod-business-backend-file.c
  * module definition/initialization for the file backend module
- * 
+ *
  * Copyright (c) 2002 Derek Atkins <warlord at MIT.EDU>
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,7 @@
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
@@ -45,38 +44,32 @@
 #include "gnc-vendor-xml-v2.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_business_backend_file_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_business_backend_file_LTX_gnc_module_current  = 0;
-int libgncmod_business_backend_file_LTX_gnc_module_revision = 0;
-int libgncmod_business_backend_file_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
 static GNCModule bus_core;
 static GNCModule file;
 
-/* forward references */
-char *libgncmod_business_backend_file_LTX_gnc_module_path(void);
-char *libgncmod_business_backend_file_LTX_gnc_module_description(void);
-int libgncmod_business_backend_file_LTX_gnc_module_init(int refcount);
-int libgncmod_business_backend_file_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_business_backend_file_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/business-core-file");
 }
 
-char * 
-libgncmod_business_backend_file_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("The XML (v2) parsers for GnuCash business objects");
 }
 
 int
-libgncmod_business_backend_file_LTX_gnc_module_init(int refcount) 
-{  
+gnc_module_init(int refcount)
+{
   if(!gnc_engine_is_initialized()) { return FALSE; }
 
   bus_core = gnc_module_load("gnucash/business-core", 0);
@@ -101,7 +94,7 @@
 }
 
 int
-libgncmod_business_backend_file_LTX_gnc_module_end(int refcount) 
+gnc_module_end(int refcount)
 {
   int unload = TRUE;
 

Modified: gnucash/branches/reshuffle-modules/src/business/business-gnome/businessmod-gnome.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/business/business-gnome/businessmod-gnome.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/business/business-gnome/businessmod-gnome.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,7 +1,7 @@
 /*********************************************************************
  * businessmod-core.c
  * module definition/initialization for the Business GNOME UI module
- * 
+ *
  * Copyright (c) 2001 Derek Atkins <warlord at MIT.EDU>
  *
  * This program is free software; you can redistribute it and/or
@@ -27,9 +27,9 @@
 #include <config.h>
 #endif
 
+#include <gmodule.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <libguile.h>
 
 #include "gnc-hooks.h"
@@ -50,34 +50,28 @@
 #include "dialog-preferences.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_business_gnome_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_business_gnome_LTX_gnc_module_current  = 0;
-int libgncmod_business_gnome_LTX_gnc_module_revision = 0;
-int libgncmod_business_gnome_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_business_gnome_LTX_gnc_module_path(void);
-char *libgncmod_business_gnome_LTX_gnc_module_description(void);
-int libgncmod_business_gnome_LTX_gnc_module_init(int refcount);
-int libgncmod_business_gnome_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_business_gnome_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/business-gnome");
 }
 
-char * 
-libgncmod_business_gnome_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("The GnuCash business module GNOME UI");
 }
 
 int
-libgncmod_business_gnome_LTX_gnc_module_init(int refcount) 
+gnc_module_init(int refcount)
 {
   /* load business-core: we depend on it -- and it depends on the engine */
   if (!gnc_module_load ("gnucash/business-core", 0)) {
@@ -143,7 +137,6 @@
 }
 
 int
-libgncmod_business_gnome_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }
-

Modified: gnucash/branches/reshuffle-modules/src/business/business-utils/gncmod-business-utils.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/business/business-utils/gncmod-business-utils.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/business/business-utils/gncmod-business-utils.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,7 +1,7 @@
 /*********************************************************************
  * gncmod-business-utils.c
  * module definition/initialization for the Business Utilitizes module
- * 
+ *
  * Copyright (c) 2003 Derek Atkins <warlord at MIT.EDU>
  *
  * This program is free software; you can redistribute it and/or
@@ -23,41 +23,35 @@
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
-#include <glib.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_business_utils_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_business_utils_LTX_gnc_module_current  = 0;
-int libgncmod_business_utils_LTX_gnc_module_revision = 0;
-int libgncmod_business_utils_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_business_utils_LTX_gnc_module_path(void);
-char *libgncmod_business_utils_LTX_gnc_module_description(void);
-int libgncmod_business_utils_LTX_gnc_module_init(int refcount);
-int libgncmod_business_utils_LTX_gnc_module_end(int refcount);
 
 char *
-libgncmod_business_utils_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/business-utils");
 }
 
-char * 
-libgncmod_business_utils_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("The GnuCash business utilities module");
 }
 
 int
-libgncmod_business_utils_LTX_gnc_module_init(int refcount) 
+gnc_module_init(int refcount)
 {
   /* load the business-core (we depend on it) */
   if (!gnc_module_load("gnucash/business-core", 0)) {
@@ -69,17 +63,17 @@
     return FALSE;
   }
 
-  if(refcount == 0) 
+  if(refcount == 0)
   {
     /* initialize known types */
   }
-  
+
   scm_c_eval_string("(use-modules (gnucash business-utils))");
 
   return TRUE;
 }
 
 int
-libgncmod_business_utils_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/business/dialog-tax-table/gncmod-dialog-tax-table.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/business/dialog-tax-table/gncmod-dialog-tax-table.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/business/dialog-tax-table/gncmod-dialog-tax-table.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,7 +1,7 @@
 /*********************************************************************
  * gncmod-dialog-tax-table.c
  * module definition/initialization for the Business Tax Table Dialog module
- * 
+ *
  * Copyright (c) 2002 Derek Atkins <warlord at MIT.EDU>
  *
  * This program is free software; you can redistribute it and/or
@@ -23,43 +23,36 @@
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
-#include <glib.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 extern SCM scm_init_sw_dialog_tax_table_module(void);
 /* version of the gnc module system interface we require */
-int libgncmod_dialog_tax_table_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_dialog_tax_table_LTX_gnc_module_current  = 0;
-int libgncmod_dialog_tax_table_LTX_gnc_module_revision = 0;
-int libgncmod_dialog_tax_table_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_dialog_tax_table_LTX_gnc_module_path(void);
-char *libgncmod_dialog_tax_table_LTX_gnc_module_description(void);
-int libgncmod_dialog_tax_table_LTX_gnc_module_init(int refcount);
-int libgncmod_dialog_tax_table_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_dialog_tax_table_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/dialog-tax-table");
 }
 
-char * 
-libgncmod_dialog_tax_table_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("The GnuCash tax-table GNOME UI module");
 }
 
 int
-libgncmod_dialog_tax_table_LTX_gnc_module_init(int refcount) 
+gnc_module_init(int refcount)
 {
   /* load business-core: we depend on it -- and it depends on the engine */
   if (!gnc_module_load ("gnucash/business-core", 0)) {
@@ -80,7 +73,6 @@
 }
 
 int
-libgncmod_dialog_tax_table_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }
-

Modified: gnucash/branches/reshuffle-modules/src/calculation/gncmod-calculation.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/calculation/gncmod-calculation.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/calculation/gncmod-calculation.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,47 +1,41 @@
 /*********************************************************************
  * gncmod-calculation.c
- * module definition/initialization for the calculation module 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the calculation module
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_calculation_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_calculation_LTX_gnc_module_current  = 0;
-int libgncmod_calculation_LTX_gnc_module_revision = 0;
-int libgncmod_calculation_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_calculation_LTX_gnc_module_path(void);
-char *libgncmod_calculation_LTX_gnc_module_description(void);
-int libgncmod_calculation_LTX_gnc_module_init(int refcount);
-int libgncmod_calculation_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_calculation_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/calculation");
 }
 
-char * 
-libgncmod_calculation_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("GnuCash calculation module");
 }
 
 int
-libgncmod_calculation_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   return TRUE;
 }
 
 int
-libgncmod_calculation_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/engine/gncmod-engine.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/engine/gncmod-engine.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/engine/gncmod-engine.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,41 +1,34 @@
 /*********************************************************************
  * gnc-mod-engine.c
  * module definition/initialization for the Engine module
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-engine.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_engine_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_engine_LTX_gnc_module_current  = 0;
-int libgncmod_engine_LTX_gnc_module_revision = 0;
-int libgncmod_engine_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_engine_LTX_gnc_module_path(void);
-char *libgncmod_engine_LTX_gnc_module_description(void);
-int libgncmod_engine_LTX_gnc_module_init(int refcount);
-int libgncmod_engine_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_engine_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/engine");
 }
 
-char * 
-libgncmod_engine_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("The GnuCash accounting engine");
 }
@@ -43,14 +36,14 @@
 extern SCM scm_init_sw_engine_module(void);
 
 int
-libgncmod_engine_LTX_gnc_module_init(int refcount) 
+gnc_module_init(int refcount)
 {
-  if(refcount == 0) 
+  if(refcount == 0)
   {
     /* initialize the engine on the first load */
     gnc_engine_init(0, NULL);
   }
-  
+
   scm_init_sw_engine_module();
   scm_c_eval_string("(use-modules (sw_engine))");
   scm_c_eval_string("(use-modules (gnucash engine))");
@@ -59,7 +52,6 @@
 }
 
 int
-libgncmod_engine_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }
-

Modified: gnucash/branches/reshuffle-modules/src/engine/test-core/gncmod-test-engine.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/engine/test-core/gncmod-test-engine.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/engine/test-core/gncmod-test-engine.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,47 +1,41 @@
 /*********************************************************************
  * gncmod-test-engine.c
- * module definition/initialization for the engine test infrastructure 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the engine test infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_test_engine_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_test_engine_LTX_gnc_module_current  = 0;
-int libgncmod_test_engine_LTX_gnc_module_revision = 0;
-int libgncmod_test_engine_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_test_engine_LTX_gnc_module_path(void);
-char *libgncmod_test_engine_LTX_gnc_module_description(void);
-int libgncmod_test_engine_LTX_gnc_module_init(int refcount);
-int libgncmod_test_engine_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_test_engine_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/engine/test");
 }
 
-char * 
-libgncmod_test_engine_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("GnuCash Engine test infrastructure.");
 }
 
 int
-libgncmod_test_engine_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   return TRUE;
 }
 
 int
-libgncmod_test_engine_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/agedver.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/agedver.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/agedver.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,31 +1,28 @@
 /* agedver.c : testing module age? */
 
 #include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
-int libagedver_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
-int libagedver_LTX_gnc_module_current = 12;
-int libagedver_LTX_gnc_module_age = 9;
-int libagedver_LTX_gnc_module_revision = 0;
-char* libagedver_LTX_gnc_module_path(void);
-char* libagedver_LTX_gnc_module_description(void);
-int libagedver_LTX_gnc_module_init(int refcount);
+int gnc_module_current = 12;
+int gnc_module_age = 9;
+int gnc_module_revision = 0;
+
 char *
-libagedver_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/agedver");
 }
 
 char *
-libagedver_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
   return g_strdup("this is a frequently extended module");
 }
 
-int 
-libagedver_LTX_gnc_module_init(int refcount) {
+int
+gnc_module_init(int refcount) {
   return TRUE;
 }
-

Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/futuremodsys.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/futuremodsys.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/futuremodsys.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -4,33 +4,28 @@
  * version 0 so it will load all the way before failing. */
 
 #include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 
 #include "gnc-module-api.h"
 
-int libfuturemodsys_LTX_gnc_module_system_interface = 123456;
+int gnc_module_system_interface = 123456;
 
-int libfuturemodsys_LTX_gnc_module_current = 0;
-int libfuturemodsys_LTX_gnc_module_age = 0;
-int libfuturemodsys_LTX_gnc_module_revision = 0;
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
 
-char* libfuturemodsys_LTX_gnc_module_path(void);
-char* libfuturemodsys_LTX_gnc_module_description(void); 
-int libfuturemodsys_LTX_gnc_module_init(int refcount);
 
-
 char *
-libfuturemodsys_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/futuremodsys");
 }
 
 char *
-libfuturemodsys_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
   return g_strdup("this is a broken future module");
 }
 
-int 
-libfuturemodsys_LTX_gnc_module_init(int refcount) {
+int
+gnc_module_init(int refcount) {
   return TRUE;
 }
-

Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/incompatdep.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/incompatdep.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/misc-mods/incompatdep.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -2,40 +2,36 @@
  * version of another module. the initialization should fail. */
 
 #include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
-int libincompatdep_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
-int libincompatdep_LTX_gnc_module_current = 0;
-int libincompatdep_LTX_gnc_module_age = 0;
-int libincompatdep_LTX_gnc_module_revision = 0;
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
 
-char *libincompatdep_LTX_gnc_module_path(void);
-char *libincompatdep_LTX_gnc_module_description(void);
-int libincompatdep_LTX_gnc_module_init(int refcount);
 
 char *
-libincompatdep_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/incompatdep");
 }
 
 char *
-libincompatdep_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
   return g_strdup("this is a broken module");
 }
 
-int 
-libincompatdep_LTX_gnc_module_init(int refcount) {
-  if (gnc_module_load("gnucash/foo", 25)) 
+int
+gnc_module_init(int refcount) {
+  if (gnc_module_load("gnucash/foo", 25))
   {
     return TRUE;
   }
-  else 
+  else
   {
     return FALSE;
   }
 }
-

Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-bar/gnc-mod-bar.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-bar/gnc-mod-bar.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-bar/gnc-mod-bar.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -3,43 +3,36 @@
 
 #include "config.h"
 #include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module-api.h"
 #include "swig-bar.c"
 
-int libgncmodbar_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
-int libgncmodbar_LTX_gnc_module_current = 0;
-int libgncmodbar_LTX_gnc_module_age = 0;
-int libgncmodbar_LTX_gnc_module_revision = 0;
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
 
-/* forward references */
-char *libgncmodbar_LTX_gnc_module_path(void);
-char *libgncmodbar_LTX_gnc_module_description(void);
-int libgncmodbar_LTX_gnc_module_init(int refcount);
-
 char *
-libgncmodbar_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/bar");
 }
 
 char *
-libgncmodbar_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
   return g_strdup("this is a bar module");
 }
 
 int
-libgncmodbar_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* publish the wrapped Scheme bindings for libbar */
   scm_init_sw_bar_module();
   scm_c_eval_string("(use-modules (sw_bar))");
-  
+
   /* use the Scheme "bar" module */
   scm_c_eval_string("(use-modules (gnucash bar))");
 
   return TRUE;
 }
-
-

Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-baz/gnc-mod-baz.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-baz/gnc-mod-baz.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-baz/gnc-mod-baz.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -3,41 +3,37 @@
 
 #include "config.h"
 #include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 #include "swig-baz.c"
 
-int libgncmodbaz_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
-int libgncmodbaz_LTX_gnc_module_current = 0;
-int libgncmodbaz_LTX_gnc_module_age = 0;
-int libgncmodbaz_LTX_gnc_module_revision = 0;
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
 
-/* forward references */
-char *libgncmodbaz_LTX_gnc_module_path(void);
-char *libgncmodbaz_LTX_gnc_module_description(void);
-int libgncmodbaz_LTX_gnc_module_init(int refcount);
-
-char * 
-libgncmodbaz_LTX_gnc_module_path(void) {
+char *
+gnc_module_path(void) {
   return g_strdup("gnucash/baz");
 }
 
-char * 
-libgncmodbaz_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("this is the baz module");
 }
 
 int
-libgncmodbaz_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load libfoo */
   if(gnc_module_load("gnucash/foo", 0)) {
     /* publish the wrapped Scheme bindings for libbaz */
     scm_init_sw_baz_module();
     scm_c_eval_string("(use-modules (sw_baz))");
-  
+
     /* use the Scheme "baz" module */
     scm_c_eval_string("(use-modules (gnucash baz))");
 
@@ -47,4 +43,3 @@
     return FALSE;
   }
 }
-

Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-foo/gnc-mod-foo.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-foo/gnc-mod-foo.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/mod-foo/gnc-mod-foo.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -3,41 +3,37 @@
 
 #include "config.h"
 #include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module-api.h"
 #include "swig-foo.c"
 
-int libgncmodfoo_LTX_gnc_module_system_interface = 0;
 
-int libgncmodfoo_LTX_gnc_module_current = 0;
-int libgncmodfoo_LTX_gnc_module_age = 0;
-int libgncmodfoo_LTX_gnc_module_revision = 0;
+int gnc_module_system_interface = 0;
 
-/* forward references */
-char *libgncmodfoo_LTX_gnc_module_path(void);
-char *libgncmodfoo_LTX_gnc_module_description(void);
-int libgncmodfoo_LTX_gnc_module_init(int refcount);
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
 
 char *
-libgncmodfoo_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/foo");
 }
 
 char *
-libgncmodfoo_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
   return g_strdup("this is a foo module");
 }
 
-int 
-libgncmodfoo_LTX_gnc_module_init(int refcount) {
+int
+gnc_module_init(int refcount) {
   /* publish the wrapped Scheme bindings for libfoo */
   scm_init_sw_foo_module();
   scm_c_eval_string("(use-modules (sw_foo))");
-  
+
   /* use the Scheme "foo" module */
   scm_c_eval_string("(use-modules (gnucash foo))");
-  
+
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/gnome-search/gncmod-gnome-search.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnome-search/gncmod-gnome-search.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/gnome-search/gncmod-gnome-search.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,7 +1,7 @@
 /*********************************************************************
  * gncmod-gnome-search
  * GNC Module initialization for the Gnome Search UI
- * 
+ *
  * Copyright (c) 2002 Derek Atkins <warlord at MIT.EDU>
  *
  * This program is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
@@ -36,34 +36,28 @@
 #include "search-core-type.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_gnome_search_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_gnome_search_LTX_gnc_module_current  = 0;
-int libgncmod_gnome_search_LTX_gnc_module_revision = 0;
-int libgncmod_gnome_search_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_gnome_search_LTX_gnc_module_path(void);
-char *libgncmod_gnome_search_LTX_gnc_module_description(void);
-int libgncmod_gnome_search_LTX_gnc_module_init(int refcount);
-int libgncmod_gnome_search_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_gnome_search_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/gnome-search");
 }
 
-char * 
-libgncmod_gnome_search_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("The GnuCash Gnome Search UI");
 }
 
 int
-libgncmod_gnome_search_LTX_gnc_module_init(int refcount) 
+gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
@@ -74,17 +68,17 @@
     return FALSE;
   }
 
-  if(refcount == 0) 
+  if(refcount == 0)
   {
     /* initialize known types */
     gnc_search_core_initialize ();
   }
-  
+
   return TRUE;
 }
 
 int
-libgncmod_gnome_search_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   /* XXX Unload the other modules */
 
   if (refcount == 0) {

Modified: gnucash/branches/reshuffle-modules/src/gnome-utils/gncmod-gnome-utils.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnome-utils/gncmod-gnome-utils.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/gnome-utils/gncmod-gnome-utils.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,14 +1,13 @@
 /*********************************************************************
  * gncmod-gnome-utils.c
- * module definition/initialization for the gnome utilities 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the gnome utilities
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
 
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
@@ -25,32 +24,26 @@
 #include "gnc-druid-provider-multifile-gnome.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_gnome_utils_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_gnome_utils_LTX_gnc_module_current  = 0;
-int libgncmod_gnome_utils_LTX_gnc_module_revision = 0;
-int libgncmod_gnome_utils_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_gnome_utils_LTX_gnc_module_path(void);
-char *libgncmod_gnome_utils_LTX_gnc_module_description(void);
-int libgncmod_gnome_utils_LTX_gnc_module_init(int refcount);
-int libgncmod_gnome_utils_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_gnome_utils_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/gnome-utils");
 }
 
-char * 
-libgncmod_gnome_utils_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Utilities for using Gnome/Gtk with GnuCash");
 }
 
 static void
-lmod(char * mn) 
+lmod(char * mn)
 {
   char * form = g_strdup_printf("(use-modules %s)\n", mn);
   scm_c_eval_string(form);
@@ -60,7 +53,7 @@
 extern SCM scm_init_sw_gnome_utils_module(void);
 
 int
-libgncmod_gnome_utils_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
@@ -84,7 +77,7 @@
   scm_init_sw_gnome_utils_module();
   lmod("(sw_gnome_utils)");
   lmod("(gnucash gnome-utils)");
-  
+
   /* Initialize the options-ui database */
   if (refcount == 0) {
     gnc_options_ui_initialize ();
@@ -101,7 +94,7 @@
 }
 
 int
-libgncmod_gnome_utils_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
 {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/import-export/binary-import/gncmod-binary-import.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/binary-import/gncmod-binary-import.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/import-export/binary-import/gncmod-binary-import.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,13 +1,12 @@
 /*********************************************************************
  * gncmod-binary-import.c
  * module definition/initialization for importing gnucash binary files
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-hooks.h"
@@ -16,32 +15,26 @@
 #include "druid-commodity.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_binary_import_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_binary_import_LTX_gnc_module_current  = 0;
-int libgncmod_binary_import_LTX_gnc_module_revision = 0;
-int libgncmod_binary_import_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_binary_import_LTX_gnc_module_path(void);
-char *libgncmod_binary_import_LTX_gnc_module_description(void);
-int libgncmod_binary_import_LTX_gnc_module_init(int refcount);
-int libgncmod_binary_import_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_binary_import_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/import-export/binary-import");
 }
 
-char * 
-libgncmod_binary_import_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Utilities importing GnuCash binary files");
 }
 
 int
-libgncmod_binary_import_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
@@ -64,6 +57,6 @@
 }
 
 int
-libgncmod_binary_import_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/import-export/gncmod-generic-import.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/gncmod-generic-import.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/import-export/gncmod-generic-import.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -5,7 +5,7 @@
  */
 
 #include "config.h"
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-import-format-gnome.h"
@@ -14,34 +14,29 @@
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 /* version of the gnc module system interface we require */
-int libgncmod_generic_import_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_generic_import_LTX_gnc_module_current  = 0;
-int libgncmod_generic_import_LTX_gnc_module_revision = 0;
-int libgncmod_generic_import_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
 /*static GNCModule engine; NOTUSED */
 
-/* forward references */
-char *libgncmod_generic_import_LTX_gnc_module_path(void);
-char *libgncmod_generic_import_LTX_gnc_module_description(void);
-int libgncmod_generic_import_LTX_gnc_module_init(int refcount);
-int libgncmod_generic_import_LTX_gnc_module_end(int refcount);
-
-
 char *
-libgncmod_generic_import_LTX_gnc_module_path(void)
+gnc_module_path(void)
 {
   return g_strdup("gnucash/import-export");
 }
+
 char *
-libgncmod_generic_import_LTX_gnc_module_description(void)
+gnc_module_description(void)
 {
   return g_strdup("Gnome GUI and C code for the generic import functions");
 }
+
 int
-libgncmod_generic_import_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
 {
   if(!gnc_module_load("gnucash/engine", 0))
   {
@@ -67,7 +62,7 @@
 }
 
 int
-libgncmod_generic_import_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
 {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/import-export/hbci/gncmod-hbci.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/hbci/gncmod-hbci.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/import-export/hbci/gncmod-hbci.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,14 +1,13 @@
 /*********************************************************************
  * gncmod-hbci.c
  * module definition/initialization for HBCI support
- * 
+ *
  * Copyright (c) 2002 Christian <stimming at tuhh.de>
  *********************************************************************/
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
@@ -20,32 +19,27 @@
 #include "dialog-preferences.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_hbci_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_hbci_LTX_gnc_module_current  = 0;
-int libgncmod_hbci_LTX_gnc_module_revision = 0;
-int libgncmod_hbci_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_hbci_LTX_gnc_module_path(void);
-char *libgncmod_hbci_LTX_gnc_module_description(void);
-int libgncmod_hbci_LTX_gnc_module_init(int refcount);
-int libgncmod_hbci_LTX_gnc_module_end(int refcount);
 
 char *
-libgncmod_hbci_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/import-export/hbci");
 }
 
-char * 
-libgncmod_hbci_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Support for HBCI protocol");
 }
 
 
 int
-libgncmod_hbci_LTX_gnc_module_init(int refcount) 
+gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
@@ -66,7 +60,7 @@
 
   /* Add menu items with C callbacks */
   gnc_plugin_hbci_create_plugin();
-  
+
   gnc_preferences_add_to_page("hbciprefs.glade", "hbci_prefs",
 			      "Online Banking");
 
@@ -77,7 +71,7 @@
 }
 
 int
-libgncmod_hbci_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   gnc_AB_BANKING_delete(0);
 
   /* Finalize gwen library */

Modified: gnucash/branches/reshuffle-modules/src/import-export/log-replay/gncmod-log-replay.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/log-replay/gncmod-log-replay.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/import-export/log-replay/gncmod-log-replay.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -25,7 +25,7 @@
  */
 #include "config.h"
 
-#include <gtk/gtk.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-log-replay.h"
@@ -34,35 +34,31 @@
 #include "gnc-plugin-log-replay.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_log_replay_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_log_replay_LTX_gnc_module_current  = 0;
-int libgncmod_log_replay_LTX_gnc_module_revision = 0;
-int libgncmod_log_replay_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
 //static GNCModule bus_core;
 //static GNCModule file;
 
-/* forward references */
-char *libgncmod_log_replay_LTX_gnc_module_path(void);
-char *libgncmod_log_replay_LTX_gnc_module_description(void);
-int libgncmod_log_replay_LTX_gnc_module_init(int refcount);
-int libgncmod_log_replay_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_log_replay_LTX_gnc_module_path(void)
+gnc_module_path(void)
 {
   return g_strdup("gnucash/import-export/log-replay");
 }
+
 char *
-libgncmod_log_replay_LTX_gnc_module_description(void)
+gnc_module_description(void)
 {
   return g_strdup("C code for log file replay");
 }
+
 int
-libgncmod_log_replay_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
 {
   if(!gnc_module_load("gnucash/engine", 0))
   {
@@ -88,7 +84,7 @@
 }
 
 int
-libgncmod_log_replay_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
 {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/import-export/ofx/gncmod-ofx-import.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/ofx/gncmod-ofx-import.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/import-export/ofx/gncmod-ofx-import.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -25,7 +25,7 @@
  */
 #include "config.h"
 
-#include <gtk/gtk.h>
+#include <gmodule.h>
 
 #include "gnc-ofx-import.h"
 #include "gnc-module.h"
@@ -33,35 +33,31 @@
 #include "gnc-plugin-ofx.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_ofx_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_ofx_LTX_gnc_module_current  = 0;
-int libgncmod_ofx_LTX_gnc_module_revision = 0;
-int libgncmod_ofx_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
 //static GNCModule bus_core;
 //static GNCModule file;
 
-/* forward references */
-char *libgncmod_ofx_LTX_gnc_module_path(void);
-char *libgncmod_ofx_LTX_gnc_module_description(void);
-int libgncmod_ofx_LTX_gnc_module_init(int refcount);
-int libgncmod_ofx_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_ofx_LTX_gnc_module_path(void)
+gnc_module_path(void)
 {
   return g_strdup("gnucash/import-export/ofx");
 }
+
 char *
-libgncmod_ofx_LTX_gnc_module_description(void)
+gnc_module_description(void)
 {
   return g_strdup("Gnome GUI and C code for OFX importer using libofx");
 }
+
 int
-libgncmod_ofx_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
 {
   if(!gnc_module_load("gnucash/engine", 0))
   {
@@ -82,12 +78,12 @@
 
   /* Add menu items with C callbacks */
   gnc_plugin_ofx_create_plugin();
-  
+
   return TRUE;
 }
 
 int
-libgncmod_ofx_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
 {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/import-export/qif-import/gncmod-qif-import.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/qif-import/gncmod-qif-import.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/import-export/qif-import/gncmod-qif-import.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,12 +1,12 @@
 /*********************************************************************
  * gncmod-qif-import.c
  * module definition/initialization for old QIF importer (deprecated)
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
@@ -17,46 +17,40 @@
 #include "gnc-plugin-qif-import.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_qif_import_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_qif_import_LTX_gnc_module_current  = 0;
-int libgncmod_qif_import_LTX_gnc_module_revision = 0;
-int libgncmod_qif_import_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_qif_import_LTX_gnc_module_path(void);
-char *libgncmod_qif_import_LTX_gnc_module_description(void);
-int libgncmod_qif_import_LTX_gnc_module_init(int refcount);
-int libgncmod_qif_import_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_qif_import_LTX_gnc_module_path(void) 
+gnc_module_path(void)
 {
   return g_strdup("gnucash/import-export/qif-import");
 }
 
-char * 
-libgncmod_qif_import_LTX_gnc_module_description(void) 
+char *
+gnc_module_description(void)
 {
   return g_strdup("Gnome GUI and Scheme code for QIF importer");
 }
 
 int
-libgncmod_qif_import_LTX_gnc_module_init(int refcount) 
+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)) 
+  if(!gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/gnome-utils", 0)) 
+  if(!gnc_module_load("gnucash/gnome-utils", 0))
   {
     return FALSE;
   }
@@ -78,7 +72,7 @@
 }
 
 int
-libgncmod_qif_import_LTX_gnc_module_end(int refcount) 
+gnc_module_end(int refcount)
 {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/import-export/qif-io-core/gncmod-qifiocore.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/qif-io-core/gncmod-qifiocore.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/import-export/qif-io-core/gncmod-qifiocore.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,44 +1,37 @@
 /*********************************************************************
  * gnc-mod-qifiocore.c
  * module definition/initialization for the QIF i/o module
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
-#include <glib.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_qifiocore_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_qifiocore_LTX_gnc_module_current  = 0;
-int libgncmod_qifiocore_LTX_gnc_module_revision = 0;
-int libgncmod_qifiocore_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_qifiocore_LTX_gnc_module_path(void);
-char *libgncmod_qifiocore_LTX_gnc_module_description(void);
-int libgncmod_qifiocore_LTX_gnc_module_init(int refcount);
-int libgncmod_qifiocore_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_qifiocore_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/qif-io/core");
 }
 
-char * 
-libgncmod_qifiocore_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Core components of QIF import/export (non-GUI)");
 }
 
 int
-libgncmod_qifiocore_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
@@ -59,6 +52,6 @@
 }
 
 int
-libgncmod_qifiocore_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/network-utils/gncmod-network-utils.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/network-utils/gncmod-network-utils.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/network-utils/gncmod-network-utils.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,48 +1,41 @@
 /*********************************************************************
  * gncmod-netword-utils.c
  * module definition/initialization for network communication utilities
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
-#include <glib.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_network_utils_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_network_utils_LTX_gnc_module_current  = 0;
-int libgncmod_network_utils_LTX_gnc_module_revision = 0;
-int libgncmod_network_utils_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_network_utils_LTX_gnc_module_path(void);
-char *libgncmod_network_utils_LTX_gnc_module_description(void);
-int libgncmod_network_utils_LTX_gnc_module_init(int refcount);
-int libgncmod_network_utils_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_network_utils_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/network-utils");
 }
 
-char * 
-libgncmod_network_utils_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Utilities for performing network communication");
 }
 
 int
-libgncmod_network_utils_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   return TRUE;
 }
 
 int
-libgncmod_network_utils_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/register/ledger-core/gncmod-ledger-core.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/register/ledger-core/gncmod-ledger-core.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/register/ledger-core/gncmod-ledger-core.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,52 +1,47 @@
 /*********************************************************************
  * gncmod-ledgercore.c
  * module definition/initialization for core (gui-independent) ledger
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
-#include <glib.h>
+#include <gmodule.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_ledger_core_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_ledger_core_LTX_gnc_module_current  = 0;
-int libgncmod_ledger_core_LTX_gnc_module_revision = 0;
-int libgncmod_ledger_core_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_ledger_core_LTX_gnc_module_path(void);
-char *libgncmod_ledger_core_LTX_gnc_module_description(void);
-int libgncmod_ledger_core_LTX_gnc_module_init(int refcount);
 
-
 char *
-libgncmod_ledger_core_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/register/ledger-core");
 }
 
-char * 
-libgncmod_ledger_core_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Toolkit-independent GUI for financial ledgers");
 }
 
 int
-libgncmod_ledger_core_LTX_gnc_module_init(int refcount) {
-  if(!gnc_module_load("gnucash/engine", 0)) 
+gnc_module_init(int refcount) {
+  if(!gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/register/register-core", 0)) 
+  if(!gnc_module_load("gnucash/register/register-core", 0))
   {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/app-utils", 0)) 
+  if(!gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;
   }

Modified: gnucash/branches/reshuffle-modules/src/register/register-core/gncmod-register-core.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/register/register-core/gncmod-register-core.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/register/register-core/gncmod-register-core.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,52 +1,47 @@
 /*********************************************************************
  * gncmod-registercore.c
  * module definition/initialization for core (gui-independent) register
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_register_core_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_register_core_LTX_gnc_module_current  = 0;
-int libgncmod_register_core_LTX_gnc_module_revision = 0;
-int libgncmod_register_core_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_register_core_LTX_gnc_module_path(void);
-char *libgncmod_register_core_LTX_gnc_module_description(void);
-int libgncmod_register_core_LTX_gnc_module_init(int refcount);
 
-
 char *
-libgncmod_register_core_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/register/register-core");
 }
 
-char * 
-libgncmod_register_core_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Toolkit-independent GUI for ledger-like table displays");
 }
 
 int
-libgncmod_register_core_LTX_gnc_module_init(int refcount)
+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)) 
+  if(!gnc_module_load("gnucash/gnome-utils", 0))
   {
     return FALSE;
   }

Modified: gnucash/branches/reshuffle-modules/src/register/register-gnome/gncmod-register-gnome.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/register/register-gnome/gncmod-register-gnome.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/register/register-gnome/gncmod-register-gnome.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,13 +1,13 @@
 /*********************************************************************
  * gncmod-register-gnome.c
  * module definition/initialization for Gnome parts of register
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
 
-#include <glib.h>
+#include <gmodule.h>
 
 #include "combocell.h"
 #include "datecell.h"
@@ -20,31 +20,26 @@
 #include "table-gnome.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_register_gnome_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_register_gnome_LTX_gnc_module_current  = 0;
-int libgncmod_register_gnome_LTX_gnc_module_revision = 0;
-int libgncmod_register_gnome_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_register_gnome_LTX_gnc_module_path(void);
-char *libgncmod_register_gnome_LTX_gnc_module_description(void);
-int libgncmod_register_gnome_LTX_gnc_module_init(int refcount);
 
-
 char *
-libgncmod_register_gnome_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/register/register-gnome");
 }
 
-char * 
-libgncmod_register_gnome_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Gnome GUI for ledger-like table displays");
 }
 
 int
-libgncmod_register_gnome_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   if(!gnc_module_load("gnucash/register/register-core", 0)) {
     return FALSE;
   }
@@ -53,7 +48,7 @@
     return FALSE;
   }
 
-  if (refcount == 0) 
+  if (refcount == 0)
   {
     gnc_register_add_cell_type (COMBO_CELL_TYPE_NAME, gnc_combo_cell_new);
 

Modified: gnucash/branches/reshuffle-modules/src/report/locale-specific/us/gncmod-locale-reports-us.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/locale-specific/us/gncmod-locale-reports-us.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/report/locale-specific/us/gncmod-locale-reports-us.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,37 +1,28 @@
 /*********************************************************************
  * gncmod-locale-reports-us.c
  * module definition/initialization for the US reports
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
-#include <glib.h>
-#include <locale.h>
-#include <string.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_locale_reports_us_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_locale_reports_us_LTX_gnc_module_current  = 0;
-int libgncmod_locale_reports_us_LTX_gnc_module_revision = 0;
-int libgncmod_locale_reports_us_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_locale_reports_us_LTX_gnc_module_path(void);
-char *libgncmod_locale_reports_us_LTX_gnc_module_description(void);
-int libgncmod_locale_reports_us_LTX_gnc_module_init(int refcount);
-int libgncmod_locale_reports_us_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_locale_reports_us_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   /* const char *thislocale = setlocale(LC_ALL, NULL);
   if (strncmp(thislocale, "de_DE", 5) == 0)
     return g_strdup("gnucash/report/locale-specific/de_DE");
@@ -39,13 +30,13 @@
   return g_strdup("gnucash/report/locale-specific/us");
 }
 
-char * 
-libgncmod_locale_reports_us_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("US income tax reports and related material");
 }
 
 int
-libgncmod_locale_reports_us_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load the tax info */
 #ifdef LOCALE_SPECIFIC_TAX
   const char *thislocale = setlocale(LC_ALL, NULL);
@@ -56,10 +47,10 @@
 #else
   gboolean is_de_DE = FALSE;
 #endif /* LOCALE_SPECIFIC_TAX */
-  const char *tax_module = is_de_DE ? 
-    "gnucash/tax/de_DE" : 
+  const char *tax_module = is_de_DE ?
+    "gnucash/tax/de_DE" :
     "gnucash/tax/us";
-  const char *report_taxtxf = is_de_DE ? 
+  const char *report_taxtxf = is_de_DE ?
     "(use-modules (gnucash report taxtxf-de_DE))" :
     "(use-modules (gnucash report taxtxf))";
   const char *report_locale = is_de_DE ?
@@ -78,14 +69,14 @@
   }
 
   /* load the report generation scheme code */
-  if(scm_c_eval_string(report_taxtxf) 
+  if(scm_c_eval_string(report_taxtxf)
      == SCM_BOOL_F) {
-    printf("failed to load %s\n", report_taxtxf);
+    g_warning("failed to load %s\n", report_taxtxf);
     return FALSE;
   }
 
   /* Load the module scheme code */
-  if(scm_c_eval_string(report_locale) 
+  if(scm_c_eval_string(report_locale)
      == SCM_BOOL_F) {
     return FALSE;
   }
@@ -94,6 +85,6 @@
 }
 
 int
-libgncmod_locale_reports_us_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/report/report-gnome/gncmod-report-gnome.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/report-gnome/gncmod-report-gnome.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/report/report-gnome/gncmod-report-gnome.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,16 +1,16 @@
 /*********************************************************************
  * gncmod-report-gnome.c
- * module definition/initialization for the gnome report infrastructure 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the gnome report infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <gmodule.h>
 #include <gtk/gtk.h>
-#include <stdio.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
@@ -19,28 +19,22 @@
 #include "window-report.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_report_gnome_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_report_gnome_LTX_gnc_module_current  = 0;
-int libgncmod_report_gnome_LTX_gnc_module_revision = 0;
-int libgncmod_report_gnome_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_report_gnome_LTX_gnc_module_path(void);
-char *libgncmod_report_gnome_LTX_gnc_module_description(void);
-int libgncmod_report_gnome_LTX_gnc_module_init(int refcount);
-int libgncmod_report_gnome_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_report_gnome_LTX_gnc_module_path(void)
+gnc_module_path(void)
 {
   return g_strdup("gnucash/report/report-gnome");
 }
 
-char * 
-libgncmod_report_gnome_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
 {
   return g_strdup("Gnome component of GnuCash report generation system");
 }
@@ -55,7 +49,7 @@
 extern SCM scm_init_sw_report_gnome_module(void);
 
 int
-libgncmod_report_gnome_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
 {
   if(!gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
@@ -80,7 +74,7 @@
 }
 
 int
-libgncmod_report_gnome_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
 {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/report/report-system/gncmod-report-system.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/report-system/gncmod-report-system.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/report/report-system/gncmod-report-system.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,47 +1,40 @@
 /*********************************************************************
  * gncmod-report-system.c
- * module definition/initialization for the report infrastructure 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the report infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_report_system_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_report_system_LTX_gnc_module_current  = 0;
-int libgncmod_report_system_LTX_gnc_module_revision = 0;
-int libgncmod_report_system_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_report_system_LTX_gnc_module_path(void);
-char *libgncmod_report_system_LTX_gnc_module_description(void);
-int libgncmod_report_system_LTX_gnc_module_init(int refcount);
-int libgncmod_report_system_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_report_system_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/report/report-system");
 }
 
-char * 
-libgncmod_report_system_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Core components of GnuCash report generation system");
 }
 
 extern SCM scm_init_sw_report_system_module(void);
 
 int
-libgncmod_report_system_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
@@ -51,7 +44,7 @@
     return FALSE;
   }
   scm_init_sw_report_system_module();
-  
+
   scm_c_eval_string("(use-modules (gnucash report report-system))");
 
   /* if this is the first time the module's being loaded, initialize
@@ -64,6 +57,6 @@
 }
 
 int
-libgncmod_report_system_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/report/standard-reports/gncmod-standard-reports.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/standard-reports/gncmod-standard-reports.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/report/standard-reports/gncmod-standard-reports.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,45 +1,38 @@
 /*********************************************************************
  * gncmod-standard-reports.c
- * module definition/initialization for the standard reports 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the standard reports
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_standard_reports_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_standard_reports_LTX_gnc_module_current  = 0;
-int libgncmod_standard_reports_LTX_gnc_module_revision = 0;
-int libgncmod_standard_reports_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_standard_reports_LTX_gnc_module_path(void);
-char *libgncmod_standard_reports_LTX_gnc_module_description(void);
-int libgncmod_standard_reports_LTX_gnc_module_init(int refcount);
-int libgncmod_standard_reports_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_standard_reports_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/report/standard-reports");
 }
 
-char * 
-libgncmod_standard_reports_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Standard income, asset, balance sheet, etc. reports");
 }
 
 int
-libgncmod_standard_reports_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load the report system */
   if(!gnc_module_load("gnucash/report/report-system", 0)) {
     return FALSE;
@@ -49,12 +42,11 @@
   if(scm_c_eval_string("(use-modules (gnucash report standard-reports))") ==
      SCM_BOOL_F) {
     return FALSE;
-  }  
+  }
   return TRUE;
 }
 
 int
-libgncmod_standard_reports_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }
-

Modified: gnucash/branches/reshuffle-modules/src/report/stylesheets/gncmod-stylesheets.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/stylesheets/gncmod-stylesheets.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/report/stylesheets/gncmod-stylesheets.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,14 +1,13 @@
 /*********************************************************************
  * gncmod-stylesheets.c
- * module definition/initialization for the standard reports 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the standard reports
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
 
 #include "gnc-module.h"
@@ -16,32 +15,26 @@
 #include "gnc-plugin-stylesheets.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_stylesheets_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_stylesheets_LTX_gnc_module_current  = 0;
-int libgncmod_stylesheets_LTX_gnc_module_revision = 0;
-int libgncmod_stylesheets_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_stylesheets_LTX_gnc_module_path(void);
-char *libgncmod_stylesheets_LTX_gnc_module_description(void);
-int libgncmod_stylesheets_LTX_gnc_module_init(int refcount);
-int libgncmod_stylesheets_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_stylesheets_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/report/stylesheets");
 }
 
-char * 
-libgncmod_stylesheets_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Standard report stylesheet definitions");
 }
 
 int
-libgncmod_stylesheets_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load the report system */
   if(!gnc_module_load("gnucash/report/report-system", 0)) {
     return FALSE;
@@ -52,14 +45,14 @@
      SCM_BOOL_F) {
     return FALSE;
   }
-  
+
   /* Add menu items with C callbacks */
   gnc_plugin_stylesheets_create_plugin();
-  
+
   return TRUE;
 }
 
 int
-libgncmod_stylesheets_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/report/utility-reports/gncmod-utility-reports.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/utility-reports/gncmod-utility-reports.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/report/utility-reports/gncmod-utility-reports.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,45 +1,38 @@
 /*********************************************************************
  * gncmod-utility-reports.c
- * module definition/initialization for the utility reports 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the utility reports
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
+#include <gmodule.h>
 #include <libguile.h>
-#include <glib.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_utility_reports_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_utility_reports_LTX_gnc_module_current  = 0;
-int libgncmod_utility_reports_LTX_gnc_module_revision = 0;
-int libgncmod_utility_reports_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_utility_reports_LTX_gnc_module_path(void);
-char *libgncmod_utility_reports_LTX_gnc_module_description(void);
-int libgncmod_utility_reports_LTX_gnc_module_init(int refcount);
-int libgncmod_utility_reports_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_utility_reports_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/report/utility-reports");
 }
 
-char * 
-libgncmod_utility_reports_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Non-financial (utility) reports");
 }
 
 int
-libgncmod_utility_reports_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* load the report system */
   if(!gnc_module_load("gnucash/report/report-system", 0)) {
     return FALSE;
@@ -50,11 +43,11 @@
      SCM_BOOL_F) {
     return FALSE;
   }
-  
+
   return TRUE;
 }
 
 int
-libgncmod_utility_reports_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/tax/us/gncmod-tax-us.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/tax/us/gncmod-tax-us.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/tax/us/gncmod-tax-us.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,37 +1,28 @@
 /*********************************************************************
  * gncmod-tax-us.c
- * module definition/initialization for us tax info 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for us tax info
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <libguile.h>
-#include <locale.h>
-#include <string.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_tax_us_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_tax_us_LTX_gnc_module_current  = 0;
-int libgncmod_tax_us_LTX_gnc_module_revision = 0;
-int libgncmod_tax_us_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_tax_us_LTX_gnc_module_path(void);
-char *libgncmod_tax_us_LTX_gnc_module_description(void);
-int libgncmod_tax_us_LTX_gnc_module_init(int refcount);
-int libgncmod_tax_us_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_tax_us_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
 #ifdef LOCALE_SPECIFIC_TAX
   const char *thislocale = setlocale(LC_ALL, NULL);
   if (strncmp(thislocale, "de_DE", 5) == 0)
@@ -41,13 +32,13 @@
     return g_strdup("gnucash/tax/us");
 }
 
-char * 
-libgncmod_tax_us_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("US income tax information");
 }
 
 static void
-lmod(char * mn) 
+lmod(char * mn)
 {
   char * form = g_strdup_printf("(use-modules %s)\n", mn);
   scm_c_eval_string(form);
@@ -55,7 +46,7 @@
 }
 
 int
-libgncmod_tax_us_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   /* This is a very simple hack that loads the (new, special) German
      tax definition file in a German locale, or (default) loads the
      previous US tax file. */
@@ -70,6 +61,6 @@
 }
 
 int
-libgncmod_tax_us_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }

Modified: gnucash/branches/reshuffle-modules/src/test-core/gncmod-test.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/test-core/gncmod-test.c	2006-12-19 09:06:03 UTC (rev 15230)
+++ gnucash/branches/reshuffle-modules/src/test-core/gncmod-test.c	2006-12-19 09:06:23 UTC (rev 15231)
@@ -1,47 +1,41 @@
 /*********************************************************************
  * gncmod-test.c
- * module definition/initialization for the test infrastructure 
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
+ * module definition/initialization for the test infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
  *********************************************************************/
 
 #include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
 
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int libgncmod_test_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_test_LTX_gnc_module_current  = 0;
-int libgncmod_test_LTX_gnc_module_revision = 0;
-int libgncmod_test_LTX_gnc_module_age      = 0;
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
 
-/* forward references */
-char *libgncmod_test_LTX_gnc_module_path(void);
-char *libgncmod_test_LTX_gnc_module_description(void);
-int libgncmod_test_LTX_gnc_module_init(int refcount);
-int libgncmod_test_LTX_gnc_module_end(int refcount);
 
-
 char *
-libgncmod_test_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
   return g_strdup("gnucash/test");
 }
 
-char * 
-libgncmod_test_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
   return g_strdup("Basic GnuCash test infrastructure.");
 }
 
 int
-libgncmod_test_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
   return TRUE;
 }
 
 int
-libgncmod_test_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
   return TRUE;
 }



More information about the gnucash-changes mailing list