Make server/network encoding configurable

[quassel.git] / src / common / main.cpp

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 6b39f5f..d958e7a 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -24,6 +24,8 @@
 #include <QTranslator>
 
 #include "global.h"
+#include "logger.h"
+#include "network.h"
 #include "settings.h"
 
 #if defined BUILD_CORE
@@ -61,6 +63,8 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
+  // Logger logger;
+
   Global::registerMetaTypes();
 
 #include "../../version.inc"
@@ -89,12 +93,17 @@ int main(int argc, char **argv) {
   quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name()));
   app.installTranslator(&quasselTranslator);
 
+  Network::setDefaultCodecForServer("ISO-8859-1");
+  Network::setDefaultCodecForEncoding("UTF-8");
+  Network::setDefaultCodecForDecoding("ISO-8859-15");
+
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel Project");
 
   // Check if a non-standard core port is requested
   QStringList args = QCoreApplication::arguments();  // TODO Build a CLI parser
+  Global::SPUTDEV = args.contains("--sputdev"); // This enables various debug features for Sput. Do not touch.
 
   Global::defaultPort = 4242;
   int idx;