r15323 - gnucash/trunk/src/business - Rename businessmod-core.c and businessmod-gnome.c.

Andreas Köhler andi5 at cvs.gnucash.org
Sun Jan 7 02:05:01 EST 2007


Author: andi5
Date: 2007-01-07 02:04:59 -0500 (Sun, 07 Jan 2007)
New Revision: 15323
Trac: http://svn.gnucash.org/trac/changeset/15323

Added:
   gnucash/trunk/src/business/business-core/gncmod-business-core.c
   gnucash/trunk/src/business/business-gnome/gncmod-business-gnome.c
Removed:
   gnucash/trunk/src/business/business-core/businessmod-core.c
   gnucash/trunk/src/business/business-gnome/businessmod-gnome.c
Modified:
   gnucash/trunk/src/business/business-core/Makefile.am
   gnucash/trunk/src/business/business-gnome/Makefile.am
Log:
Rename businessmod-core.c and businessmod-gnome.c.

Move these two files to gncmod-business-core.c and
gncmod-business-gnome.c, resp., to better match the common naming.


Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am	2007-01-07 07:04:47 UTC (rev 15322)
+++ gnucash/trunk/src/business/business-core/Makefile.am	2007-01-07 07:04:59 UTC (rev 15323)
@@ -14,7 +14,7 @@
 libgncmod_business_core_la_SOURCES = \
   swig-business-core.c \
   gncBusGuile.c \
-  businessmod-core.c \
+  gncmod-business-core.c \
   gncAddress.c \
   gncBillTerm.c \
   gncBusiness.c \

Deleted: gnucash/trunk/src/business/business-core/businessmod-core.c
===================================================================
--- gnucash/trunk/src/business/business-core/businessmod-core.c	2007-01-07 07:04:47 UTC (rev 15322)
+++ gnucash/trunk/src/business/business-core/businessmod-core.c	2007-01-07 07:04:59 UTC (rev 15323)
@@ -1,102 +0,0 @@
-/*********************************************************************
- * 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
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, contact:
- *
- * Free Software Foundation           Voice:  +1-617-542-5942
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
- * Boston, MA  02110-1301,  USA       gnu at gnu.org
- *
- *********************************************************************/
-
-#include "config.h"
-#include <gmodule.h>
-#include <libguile.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "gncAddressP.h"
-#include "gncBillTermP.h"
-#include "gncCustomerP.h"
-#include "gncEmployeeP.h"
-#include "gncEntryP.h"
-#include "gncInvoiceP.h"
-#include "gncJobP.h"
-#include "gncOrderP.h"
-#include "gncOwnerP.h"
-#include "gncTaxTableP.h"
-#include "gncVendorP.h"
-
-extern SCM scm_init_sw_business_core_module (void);
-
-/* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
-
-
-char *
-gnc_module_path(void)
-{
-  return g_strdup("gnucash/business-core");
-}
-
-char *
-gnc_module_description(void)
-{
-  return g_strdup("The GnuCash business core");
-}
-
-int
-gnc_module_init(int refcount)
-{
-  /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
-    return FALSE;
-  }
-
-  if(refcount == 0)
-  {
-    /* initialize known types */
-    gncInvoiceRegister ();
-    gncJobRegister ();
-    gncBillTermRegister ();
-    gncCustomerRegister ();
-    gncAddressRegister ();
-    gncEmployeeRegister ();
-    gncEntryRegister ();
-    gncOrderRegister ();
-    gncOwnerRegister ();
-    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))");
-
-  return TRUE;
-}
-
-int
-gnc_module_end(int refcount) {
-  return TRUE;
-}

Copied: gnucash/trunk/src/business/business-core/gncmod-business-core.c (from rev 15322, gnucash/trunk/src/business/business-core/businessmod-core.c)
===================================================================
--- gnucash/trunk/src/business/business-core/businessmod-core.c	2007-01-07 07:04:47 UTC (rev 15322)
+++ gnucash/trunk/src/business/business-core/gncmod-business-core.c	2007-01-07 07:04:59 UTC (rev 15323)
@@ -0,0 +1,102 @@
+/*********************************************************************
+ * 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
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact:
+ *
+ * Free Software Foundation           Voice:  +1-617-542-5942
+ * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
+ * Boston, MA  02110-1301,  USA       gnu at gnu.org
+ *
+ *********************************************************************/
+
+#include "config.h"
+#include <gmodule.h>
+#include <libguile.h>
+
+#include "gnc-module.h"
+#include "gnc-module-api.h"
+
+#include "gncAddressP.h"
+#include "gncBillTermP.h"
+#include "gncCustomerP.h"
+#include "gncEmployeeP.h"
+#include "gncEntryP.h"
+#include "gncInvoiceP.h"
+#include "gncJobP.h"
+#include "gncOrderP.h"
+#include "gncOwnerP.h"
+#include "gncTaxTableP.h"
+#include "gncVendorP.h"
+
+extern SCM scm_init_sw_business_core_module (void);
+
+/* version of the gnc module system interface we require */
+int gnc_module_system_interface = 0;
+
+/* module versioning uses libtool semantics. */
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
+
+
+char *
+gnc_module_path(void)
+{
+  return g_strdup("gnucash/business-core");
+}
+
+char *
+gnc_module_description(void)
+{
+  return g_strdup("The GnuCash business core");
+}
+
+int
+gnc_module_init(int refcount)
+{
+  /* load the engine (we depend on it) */
+  if(!gnc_module_load("gnucash/engine", 0)) {
+    return FALSE;
+  }
+
+  if(refcount == 0)
+  {
+    /* initialize known types */
+    gncInvoiceRegister ();
+    gncJobRegister ();
+    gncBillTermRegister ();
+    gncCustomerRegister ();
+    gncAddressRegister ();
+    gncEmployeeRegister ();
+    gncEntryRegister ();
+    gncOrderRegister ();
+    gncOwnerRegister ();
+    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))");
+
+  return TRUE;
+}
+
+int
+gnc_module_end(int refcount) {
+  return TRUE;
+}

Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am	2007-01-07 07:04:47 UTC (rev 15322)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am	2007-01-07 07:04:59 UTC (rev 15323)
@@ -29,7 +29,6 @@
   -I${top_srcdir}/src/register/ledger-core
 
 libgncmod_business_gnome_la_SOURCES = \
-  businessmod-gnome.c \
   business-options-gnome.c \
   business-urls.c \
   business-gnome-utils.c \
@@ -45,6 +44,7 @@
   dialog-vendor.c \
   gnc-plugin-business.c \
   gnc-plugin-page-invoice.c \
+  gncmod-business-gnome.c \
   search-owner.c
 
 noinst_HEADERS = \

Deleted: gnucash/trunk/src/business/business-gnome/businessmod-gnome.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/businessmod-gnome.c	2007-01-07 07:04:47 UTC (rev 15322)
+++ gnucash/trunk/src/business/business-gnome/businessmod-gnome.c	2007-01-07 07:04:59 UTC (rev 15323)
@@ -1,142 +0,0 @@
-/*********************************************************************
- * 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
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, contact:
- *
- * Free Software Foundation           Voice:  +1-617-542-5942
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
- * Boston, MA  02110-1301,  USA       gnu at gnu.org
- *
- *********************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gmodule.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libguile.h>
-
-#include "gnc-hooks.h"
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "search-core-type.h"
-#include "search-owner.h"
-#include "gncOwner.h"
-#include "business-options-gnome.h"
-#include "business-urls.h"
-
-#include "gnc-plugin-manager.h"
-#include "gnc-plugin-business.h"
-
-#include "gnc-hooks.h"
-#include "dialog-invoice.h"
-#include "dialog-preferences.h"
-
-/* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
-
-
-char *
-gnc_module_path(void)
-{
-  return g_strdup("gnucash/business-gnome");
-}
-
-char *
-gnc_module_description(void)
-{
-  return g_strdup("The GnuCash business module GNOME UI");
-}
-
-int
-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)) {
-    return FALSE;
-  }
-  /* We also depend on app-utils, gnome-utils, and gnome-search modules */
-  if (!gnc_module_load ("gnucash/app-utils", 0)) {
-    return FALSE;
-  }
-  if (!gnc_module_load ("gnucash/gnome-utils", 0)) {
-    return FALSE;
-  }
-  if (!gnc_module_load ("gnucash/gnome-search", 0)) {
-    return FALSE;
-  }
-  if (!gnc_module_load ("gnucash/report/report-gnome", 0)) {
-    return FALSE;
-  }
-  //  if (!gnc_module_load ("gnucash/report/standard-reports", 0)) {
-  //    return FALSE;
-  //  }
-
-  scm_c_eval_string("(use-modules (gnucash business-gnome))");
-  scm_c_eval_string("(use-modules (gnucash report business-reports))");
-
-  // temp code until gnc:url-type is wrapped
-  /*
-  {
-      SCM wct_gnc_url_type = scm_c_eval_string("<gnc:url-type>");
-      SCM tmp;
-
-      tmp = gw_wcp_assimilate_ptr(GNC_CUSTOMER_MODULE_NAME, wct_gnc_url_type);
-      scm_c_define("gnc:url-type-customer", tmp);
-      tmp = gw_wcp_assimilate_ptr(GNC_VENDOR_MODULE_NAME, wct_gnc_url_type);
-      scm_c_define("gnc:url-type-vendor", tmp);
-      tmp = gw_wcp_assimilate_ptr(GNC_EMPLOYEE_MODULE_NAME, wct_gnc_url_type);
-      scm_c_define("gnc:url-type-employee", tmp);
-      tmp = gw_wcp_assimilate_ptr(GNC_INVOICE_MODULE_NAME, wct_gnc_url_type);
-      scm_c_define("gnc:url-type-invoice", tmp);
-      tmp = gw_wcp_assimilate_ptr(URL_TYPE_OWNERREPORT, wct_gnc_url_type);
-      scm_c_define("gnc:url-type-ownerreport", tmp);
-  }
-  */
-
-  if (refcount == 0) {
-    /* Register the Owner search type */
-    gnc_search_core_register_type (GNC_OWNER_MODULE_NAME,
-				   (GNCSearchCoreNew) gnc_search_owner_new);
-    gnc_business_urls_initialize ();
-    gnc_business_options_gnome_initialize ();
-
-    gnc_plugin_manager_add_plugin (gnc_plugin_manager_get (),
-				   gnc_plugin_business_new ());
-
-    gnc_hook_add_dangler(HOOK_BOOK_OPENED,
-			 (GFunc)gnc_invoice_remind_bills_due_cb, NULL);
-
-    gnc_preferences_add_page("businessprefs.glade", "business_prefs",
-			     _("Business"));
-  }
-
-  return TRUE;
-}
-
-int
-gnc_module_end(int refcount) {
-  return TRUE;
-}

Copied: gnucash/trunk/src/business/business-gnome/gncmod-business-gnome.c (from rev 15322, gnucash/trunk/src/business/business-gnome/businessmod-gnome.c)
===================================================================
--- gnucash/trunk/src/business/business-gnome/businessmod-gnome.c	2007-01-07 07:04:47 UTC (rev 15322)
+++ gnucash/trunk/src/business/business-gnome/gncmod-business-gnome.c	2007-01-07 07:04:59 UTC (rev 15323)
@@ -0,0 +1,142 @@
+/*********************************************************************
+ * 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
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact:
+ *
+ * Free Software Foundation           Voice:  +1-617-542-5942
+ * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
+ * Boston, MA  02110-1301,  USA       gnu at gnu.org
+ *
+ *********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gmodule.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <libguile.h>
+
+#include "gnc-hooks.h"
+#include "gnc-module.h"
+#include "gnc-module-api.h"
+
+#include "search-core-type.h"
+#include "search-owner.h"
+#include "gncOwner.h"
+#include "business-options-gnome.h"
+#include "business-urls.h"
+
+#include "gnc-plugin-manager.h"
+#include "gnc-plugin-business.h"
+
+#include "gnc-hooks.h"
+#include "dialog-invoice.h"
+#include "dialog-preferences.h"
+
+/* version of the gnc module system interface we require */
+int gnc_module_system_interface = 0;
+
+/* module versioning uses libtool semantics. */
+int gnc_module_current  = 0;
+int gnc_module_revision = 0;
+int gnc_module_age      = 0;
+
+
+char *
+gnc_module_path(void)
+{
+  return g_strdup("gnucash/business-gnome");
+}
+
+char *
+gnc_module_description(void)
+{
+  return g_strdup("The GnuCash business module GNOME UI");
+}
+
+int
+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)) {
+    return FALSE;
+  }
+  /* We also depend on app-utils, gnome-utils, and gnome-search modules */
+  if (!gnc_module_load ("gnucash/app-utils", 0)) {
+    return FALSE;
+  }
+  if (!gnc_module_load ("gnucash/gnome-utils", 0)) {
+    return FALSE;
+  }
+  if (!gnc_module_load ("gnucash/gnome-search", 0)) {
+    return FALSE;
+  }
+  if (!gnc_module_load ("gnucash/report/report-gnome", 0)) {
+    return FALSE;
+  }
+  //  if (!gnc_module_load ("gnucash/report/standard-reports", 0)) {
+  //    return FALSE;
+  //  }
+
+  scm_c_eval_string("(use-modules (gnucash business-gnome))");
+  scm_c_eval_string("(use-modules (gnucash report business-reports))");
+
+  // temp code until gnc:url-type is wrapped
+  /*
+  {
+      SCM wct_gnc_url_type = scm_c_eval_string("<gnc:url-type>");
+      SCM tmp;
+
+      tmp = gw_wcp_assimilate_ptr(GNC_CUSTOMER_MODULE_NAME, wct_gnc_url_type);
+      scm_c_define("gnc:url-type-customer", tmp);
+      tmp = gw_wcp_assimilate_ptr(GNC_VENDOR_MODULE_NAME, wct_gnc_url_type);
+      scm_c_define("gnc:url-type-vendor", tmp);
+      tmp = gw_wcp_assimilate_ptr(GNC_EMPLOYEE_MODULE_NAME, wct_gnc_url_type);
+      scm_c_define("gnc:url-type-employee", tmp);
+      tmp = gw_wcp_assimilate_ptr(GNC_INVOICE_MODULE_NAME, wct_gnc_url_type);
+      scm_c_define("gnc:url-type-invoice", tmp);
+      tmp = gw_wcp_assimilate_ptr(URL_TYPE_OWNERREPORT, wct_gnc_url_type);
+      scm_c_define("gnc:url-type-ownerreport", tmp);
+  }
+  */
+
+  if (refcount == 0) {
+    /* Register the Owner search type */
+    gnc_search_core_register_type (GNC_OWNER_MODULE_NAME,
+				   (GNCSearchCoreNew) gnc_search_owner_new);
+    gnc_business_urls_initialize ();
+    gnc_business_options_gnome_initialize ();
+
+    gnc_plugin_manager_add_plugin (gnc_plugin_manager_get (),
+				   gnc_plugin_business_new ());
+
+    gnc_hook_add_dangler(HOOK_BOOK_OPENED,
+			 (GFunc)gnc_invoice_remind_bills_due_cb, NULL);
+
+    gnc_preferences_add_page("businessprefs.glade", "business_prefs",
+			     _("Business"));
+  }
+
+  return TRUE;
+}
+
+int
+gnc_module_end(int refcount) {
+  return TRUE;
+}



More information about the gnucash-changes mailing list