X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=dca70339e5f6a3687a5fabb1d7a60aa771d13bde;hp=f34cfd16a247e79cc416ccf64207182f10fa0f62;hb=2f953e817b56e8dfd3770b2109b3a81b0854f3a8;hpb=f18d7db990cb23c87fa3586e19b2f8aa5509a66c

diff --git a/src/common/main.cpp b/src/common/main.cpp
index f34cfd16..dca70339 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -25,6 +25,7 @@
 
 #include "global.h"
 #include "logger.h"
+#include "network.h"
 #include "settings.h"
 
 #if defined BUILD_CORE
@@ -53,7 +54,7 @@
 
 //! Signal handler for graceful shutdown.
 void handle_signal(int sig) {
-  qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii());
+  qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig)));
   QCoreApplication::quit();
 }
 
@@ -65,8 +66,7 @@ int main(int argc, char **argv) {
   // Logger logger;
 
   Global::registerMetaTypes();
-
-#include "../../version.inc"
+  Global::setupVersion();
 
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
@@ -92,12 +92,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::DEBUG = args.contains("--debug"); // This enables various debug features.
 
   Global::defaultPort = 4242;
   int idx;