Fixed Bug #20 (Handle Numeric Reply 433 ERR_NICKNAMEINUSE properly)

[quassel.git] / main / main_gui.cpp

diff --git a/main/main_gui.cpp b/main/main_gui.cpp
index 2d9c4e7..f48f615 100644 (file)
--- a/main/main_gui.cpp
+++ b/main/main_gui.cpp
@@ -38,8 +38,6 @@ int main(int argc, char **argv) {
   QApplication::setApplicationName("Quassel IRC");
   QApplication::setOrganizationName("The Quassel Team");
 
-  qRegisterMetaType<LayoutTask>("LayoutTask");
-
   Global::runMode = Global::GUIOnly;
   Global::quasselDir = QDir::homePath() + "/.quassel";
 
@@ -76,6 +74,7 @@ void MainWin::syncToCore() {
     //qApp->quit();
     exit(1);
   }
+  /*
   foreach(QString net, state["CoreBackLog"].toMap().keys()) {
     QByteArray logbuf = state["CoreBackLog"].toMap()[net].toByteArray();
     QDataStream in(&logbuf, QIODevice::ReadOnly); in.setVersion(QDataStream::Qt_4_2);
@@ -85,6 +84,9 @@ void MainWin::syncToCore() {
     }
     qDebug() << net << coreBackLog[net].count();
   }
+  */
+  coreBuffers.clear();
+  foreach(QVariant v, state["CoreBuffers"].toList()) { coreBuffers.append(v.value<BufferId>()); }
 }
 
 GUIProxy::GUIProxy() {