X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=d958e7a0c70b32cfb324d179dc5ff280a32939b3;hp=f715192357d5fd4635674f81cadab1aec3688bb5;hb=189c2def1996c6a25a8182794f2d6efbbf712867;hpb=c6bc07febff322910675a1eb60c44f6be209a934

diff --git a/src/common/main.cpp b/src/common/main.cpp
index f7151923..d958e7a0 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,12 +18,16 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "global.h"
-#include "identity.h"
-#include "settings.h"
+#include <QDateTime>
 #include <QString>
+#include <QTimer>
 #include <QTranslator>
 
+#include "global.h"
+#include "logger.h"
+#include "network.h"
+#include "settings.h"
+
 #if defined BUILD_CORE
 #include <QCoreApplication>
 #include <QDir>
@@ -59,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);
@@ -72,6 +80,8 @@ int main(int argc, char **argv) {
   QApplication app(argc, argv);
 #endif
 
+  qsrand(QDateTime::currentDateTime().toTime_t());
+
   // Set up i18n support
   QLocale locale = QLocale::system();
 
@@ -83,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 IRC Development Team");  // FIXME
+  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;
@@ -106,11 +121,13 @@ int main(int argc, char **argv) {
 #ifndef BUILD_CORE
   QtUi *gui = new QtUi();
   Client::init(gui);
-  gui->init();
+  // init gui only after the event loop has started
+  QTimer::singleShot(0, gui, SLOT(init()));
+  //gui->init();
 #endif
 
 #ifndef BUILD_QTUI
-  if(args.contains("--norestore")) {
+  if(!args.contains("--norestore")) {
     Core::restoreState();
   }
 #endif