[Gnucash-changes] r14166 - gnucash/branches/misc-backend/lib/libqof
- Move the QSF backend from custom init to GModule init.
Chris Shoemaker
chris at cvs.gnucash.org
Tue May 23 23:34:19 EDT 2006
Author: chris
Date: 2006-05-23 23:34:18 -0400 (Tue, 23 May 2006)
New Revision: 14166
Trac: http://svn.gnucash.org/trac/changeset/14166
Modified:
gnucash/branches/misc-backend/lib/libqof/backend/file/Makefile.am
gnucash/branches/misc-backend/lib/libqof/backend/file/qof-backend-qsf.h
gnucash/branches/misc-backend/lib/libqof/backend/file/qsf-backend.c
gnucash/branches/misc-backend/lib/libqof/qof/qof.h
gnucash/branches/misc-backend/lib/libqof/qof/qofsession.c
Log:
Move the QSF backend from custom init to GModule init.
Modified: gnucash/branches/misc-backend/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/branches/misc-backend/lib/libqof/backend/file/Makefile.am 2006-05-24 03:21:09 UTC (rev 14165)
+++ gnucash/branches/misc-backend/lib/libqof/backend/file/Makefile.am 2006-05-24 03:34:18 UTC (rev 14166)
@@ -14,6 +14,7 @@
qsf-xml-map.c \
qsf-xml.c
+libgncqof_backend_qsf_la_LDFLAGS = -module
libgncqof_backend_qsf_la_LIBADD = \
${QOF_LIBS} \
${GLIB_LIBS} \
Modified: gnucash/branches/misc-backend/lib/libqof/backend/file/qof-backend-qsf.h
===================================================================
--- gnucash/branches/misc-backend/lib/libqof/backend/file/qof-backend-qsf.h 2006-05-24 03:21:09 UTC (rev 14165)
+++ gnucash/branches/misc-backend/lib/libqof/backend/file/qof-backend-qsf.h 2006-05-24 03:34:18 UTC (rev 14166)
@@ -139,6 +139,7 @@
#ifndef _QOF_BACKEND_QSF_H
#define _QOF_BACKEND_QSF_H
+#include <gmodule.h>
#include "qoflog.h"
#include "qofbackend.h"
@@ -162,7 +163,8 @@
Calls gettext because QofBackendOption
strings are translatable.
*/
-void qsf_provider_init(void);
+G_MODULE_EXPORT const gchar *
+g_module_check_init(GModule *module);
/** \name Supported backend configurations
@{
Modified: gnucash/branches/misc-backend/lib/libqof/backend/file/qsf-backend.c
===================================================================
--- gnucash/branches/misc-backend/lib/libqof/backend/file/qsf-backend.c 2006-05-24 03:21:09 UTC (rev 14165)
+++ gnucash/branches/misc-backend/lib/libqof/backend/file/qsf-backend.c 2006-05-24 03:34:18 UTC (rev 14166)
@@ -1270,17 +1270,11 @@
g_free (prov);
}
-void
-qsf_provider_init(void)
+G_MODULE_EXPORT const gchar *
+g_module_check_init(GModule *module)
{
QofBackendProvider *prov;
-/* #ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
- bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
- #endif*/
prov = g_new0 (QofBackendProvider, 1);
prov->provider_name = "QSF Backend Version 0.2";
prov->access_method = "file";
@@ -1289,4 +1283,5 @@
prov->check_data_type = qsf_determine_file_type;
prov->provider_free = qsf_provider_free;
qof_backend_register_provider (prov);
+ return NULL;
}
Modified: gnucash/branches/misc-backend/lib/libqof/qof/qof.h
===================================================================
--- gnucash/branches/misc-backend/lib/libqof/qof/qof.h 2006-05-24 03:21:09 UTC (rev 14165)
+++ gnucash/branches/misc-backend/lib/libqof/qof/qof.h 2006-05-24 03:34:18 UTC (rev 14166)
@@ -106,8 +106,6 @@
/** allow easy logging of QSF debug messages */
#define QOF_MOD_QSF "gncqof-backend-qsf"
/** allow easy loading of the QSF backend */
-#define QSF_BACKEND_LIB "libgncqof-backend-qsf"
-/** allow easy loading of the QSF backend */
-#define QSF_MODULE_INIT "qsf_provider_init"
+#define QSF_BACKEND_LIB "gncqof-backend-qsf"
#endif /* QOF_H_ */
Modified: gnucash/branches/misc-backend/lib/libqof/qof/qofsession.c
===================================================================
--- gnucash/branches/misc-backend/lib/libqof/qof/qofsession.c 2006-05-24 03:21:09 UTC (rev 14165)
+++ gnucash/branches/misc-backend/lib/libqof/qof/qofsession.c 2006-05-24 03:34:18 UTC (rev 14166)
@@ -843,7 +843,6 @@
{
const char *libdir;
const char *filename;
- const char *init_fcn;
};
/* All available QOF backends need to be described here
@@ -851,11 +850,11 @@
Remember: Use the libdir from the current build environment
and use JUST the module name without .so - .so is not portable! */
struct backend_providers backend_list[] = {
- { QOF_LIB_DIR, QSF_BACKEND_LIB, QSF_MODULE_INIT },
+ { QOF_LIB_DIR, QSF_BACKEND_LIB },
#ifdef HAVE_DWI
- { QOF_LIB_DIR, "libqof_backend_dwi", "dwiend_provider_init" },
+ { QOF_LIB_DIR, "libqof_backend_dwi"},
#endif
- { NULL, NULL, NULL }
+ { NULL, NULL }
};
static void
More information about the gnucash-changes
mailing list