[sword-cvs] sword/src/mgr installmgr.cpp,1.19,1.20 localemgr.cpp,1.16,1.17

[sword@www.crosswire.org]

Update of /cvs/core/sword/src/mgr
In directory www:/tmp/cvs-serv27385/src/mgr

Modified Files:
	installmgr.cpp localemgr.cpp 
Log Message:

dglassey: change systemLocaleMgr to a function that returns the static object


Index: installmgr.cpp
===================================================================
RCS file: /cvs/core/sword/src/mgr/installmgr.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- installmgr.cpp	31 Jan 2004 00:09:31 -0000	1.19
+++ installmgr.cpp	5 Feb 2004 10:24:36 -0000	1.20
@@ -48,7 +48,7 @@
 
 InstallMgr_init::InstallMgr_init() {
 #ifdef CURLAVAILABLE
-	curl_global_init(CURL_GLOBAL_DEFAULT);
+	//curl_global_init(CURL_GLOBAL_DEFAULT);  // curl_easy_init automatically calls it if needed
 #else
 //	fprintf(stderr, "libCURL is needed for remote installation functions\n");
 #endif

Index: localemgr.cpp
===================================================================
RCS file: /cvs/core/sword/src/mgr/localemgr.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- localemgr.cpp	5 Jul 2003 04:58:42 -0000	1.16
+++ localemgr.cpp	5 Feb 2004 10:24:36 -0000	1.17
@@ -42,8 +42,11 @@
 SWORD_NAMESPACE_START
 
 
-LocaleMgr LocaleMgr::systemLocaleMgr;
-
+//LocaleMgr LocaleMgr::systemLocaleMgr;
+LocaleMgr& LocaleMgr::systemLocaleMgr() {
+	static LocaleMgr slm;
+	return slm;
+}
 
 LocaleMgr::LocaleMgr(const char *iConfigPath) {
 	locales = new LocaleMap();