Extended NetworkInfo again to prepare for even more sophisticated encoding stuff.

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

diff --git a/src/common/main.cpp b/src/common/main.cpp
index ecd0fa5..378d8fe 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -24,7 +24,8 @@
 #include <QTranslator>
 
 #include "global.h"
-#include "identity.h"
+#include "logger.h"
+#include "network.h"
 #include "settings.h"
 
 #if defined BUILD_CORE
@@ -62,6 +63,8 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
+  // Logger logger;
+
   Global::registerMetaTypes();
 
 #include "../../version.inc"
@@ -90,6 +93,10 @@ int main(int argc, char **argv) {
   quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name()));
   app.installTranslator(&quasselTranslator);
 
+  Network::setDefaultCodecForServer("UTF-8");
+  Network::setDefaultCodecForEncoding("UTF-8");
+  Network::setDefaultCodecForDecoding("ISO-8859-15");
+
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel Project");