X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=23ffbfbc181f3a0fd368d0ee2d59168ccc6bcaa0;hp=b5fe32cf22fb1fbe8191d9b7fe87d4504e2ad16a;hb=8f237cecca9a6353bc4d150b4b55719a6bf37476;hpb=9a6a8478bdd8c7c5bb4ff1fa3de9510863d65a97

diff --git a/src/common/main.cpp b/src/common/main.cpp
index b5fe32cf..23ffbfbc 100644
--- 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,8 +63,12 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
+  // Logger logger;
+
   Global::registerMetaTypes();
 
+#include "../../version.inc"
+
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
   QCoreApplication app(argc, argv);
@@ -88,6 +93,9 @@ int main(int argc, char **argv) {
   quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name()));
   app.installTranslator(&quasselTranslator);
 
+  Network::setDefaultCodecForEncoding("UTF-8");
+  Network::setDefaultCodecForDecoding("ISO-8859-15");
+
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel Project");