This is the long-awaited monster commit, bringing you a redesigned core arch and...

[quassel.git] / src / qtui / mainwin.cpp

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 6c63404..8aa0bb2 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -129,7 +129,7 @@ void MainWin::init() {
   // attach the BufferWidget to the PropertyMapper
   Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
   connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),
   // attach the BufferWidget to the PropertyMapper
   Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
   connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),

-         ui.bufferWidget, SLOT(removeBuffer(BufferId)));
+          ui.bufferWidget, SLOT(removeBuffer(BufferId)));

 
   // attach the NickList to the PropertyMapper
   Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
 
   // attach the NickList to the PropertyMapper
   Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");


@@ -237,14 +237,14 @@ void MainWin::showCoreConnectionDlg(bool autoConnect) {
   coreConnectDlg = new CoreConnectDlg(this, autoConnect);
   connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
   coreConnectDlg->setModal(true);
   coreConnectDlg = new CoreConnectDlg(this, autoConnect);
   connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
   coreConnectDlg->setModal(true);

-  if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
+  //if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())

     coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar
     coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar

-  if(autoConnect) coreConnectDlg->doAutoConnect();
+  //if(autoConnect) coreConnectDlg->doAutoConnect();

 }
 
 void MainWin::coreConnectionDlgFinished(int /*code*/) {
 }
 
 void MainWin::coreConnectionDlgFinished(int /*code*/) {

-

   coreConnectDlg->close();
   coreConnectDlg->close();

+  //exit(1);

 }
 
 
 }