Merged changes from branch "sput" r56:61 back into trunk.

[quassel.git] / main / main_gui.cpp

diff --git a/main/main_gui.cpp b/main/main_gui.cpp
index 3ee9f9f..2d9c4e7 100644 (file)
--- a/main/main_gui.cpp
+++ b/main/main_gui.cpp
@@ -28,6 +28,7 @@
 #include "guiproxy.h"
 #include "coreconnectdlg.h"
 #include "util.h"
 #include "guiproxy.h"
 #include "coreconnectdlg.h"
 #include "util.h"

+#include "chatwidget.h"

 
 #include "mainwin.h"
 
 
 #include "mainwin.h"
 


@@ -37,6 +38,8 @@ int main(int argc, char **argv) {
   QApplication::setApplicationName("Quassel IRC");
   QApplication::setOrganizationName("The Quassel Team");
 
   QApplication::setApplicationName("Quassel IRC");
   QApplication::setOrganizationName("The Quassel Team");
 

+  qRegisterMetaType<LayoutTask>("LayoutTask");
+

   Global::runMode = Global::GUIOnly;
   Global::quasselDir = QDir::homePath() + "/.quassel";
 
   Global::runMode = Global::GUIOnly;
   Global::quasselDir = QDir::homePath() + "/.quassel";
 


@@ -46,9 +49,11 @@ int main(int argc, char **argv) {
   Style::init();
 
   MainWin mainWin;
   Style::init();
 
   MainWin mainWin;

+  mainWin.init();

   int exitCode = app.exec();
   delete guiProxy;
   delete global;
   int exitCode = app.exec();
   delete guiProxy;
   delete global;

+  return exitCode;

 }
 
 void MainWin::syncToCore() {
 }
 
 void MainWin::syncToCore() {