Move locale initialization to the base NetworkPlugin class

3 files changed, 5 insertions, 5 deletions

diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
index 4b376417..ee740ec9 100644
--- a/backends/libpurple/main.cpp
+++ b/backends/libpurple/main.cpp
@@ -2275,8 +2275,6 @@ static void transportDataReceived(gpointer data, gint source, PurpleInputConditi
 }
 
 int main(int argc, char **argv) {
-	boost::locale::generator gen;
-	std::locale::global(gen(""));
 #ifndef WIN32
 #if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__)
 		mallopt(M_CHECK_ACTION, 2);
diff --git a/backends/twitter/main.cpp b/backends/twitter/main.cpp
index 457e2bf1..5d4d61da 100644
--- a/backends/twitter/main.cpp
+++ b/backends/twitter/main.cpp
@@ -1,5 +1,5 @@
 #include "TwitterPlugin.h"
-#include <boost/locale.hpp>
+
 DEFINE_LOGGER(logger, "Twitter Backend");
 
 #ifndef _WIN32
@@ -22,8 +22,6 @@ static void spectrum_sigchld_handler(int sig)
 
 
 int main (int argc, char* argv[]) {
-	boost::locale::generator gen;
-	std::locale::global(gen(""));
 	std::string host;
 	int port;
 #ifndef _WIN32
diff --git a/plugin/cpp/networkplugin.cpp b/plugin/cpp/networkplugin.cpp
index e1c2f66b..cc1dba24 100644
--- a/plugin/cpp/networkplugin.cpp
+++ b/plugin/cpp/networkplugin.cpp
@@ -35,6 +35,8 @@
 #define getpid _getpid
 #endif
 
+#include <boost/locale.hpp>
+
 DEFINE_LOGGER(logger, "NetworkPlugin");
 
 namespace Transport {
@@ -45,6 +47,8 @@ namespace Transport {
 	wrap.SerializeToString(&MESSAGE);
 
 NetworkPlugin::NetworkPlugin() {
+	boost::locale::generator gen;
+	std::locale::global(gen(""));
 	m_pingReceived = false;
 
 	double shared;