Merging r780:797 from trunk to branches/0.3.

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

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 8c77f4c..fb610e0 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -25,8 +25,11 @@
 #include "bufferviewconfig.h"
 #include "bufferviewfilter.h"
 #include "bufferviewmanager.h"
-#include "chatline.h"
-#include "chatline-old.h"
+#ifdef SPUTDEV
+# include "chatline.h"
+#else
+# include "chatline-old.h"
+#endif
 #include "client.h"
 #include "clientbacklogmanager.h"
 #include "coreconnectdlg.h"
@@ -266,7 +269,8 @@ void MainWin::setupNickWidget() {
 
   addDockWidget(Qt::RightDockWidgetArea, nickDock);
   ui.menuViews->addAction(nickDock->toggleViewAction());
-  connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
+  // See NickListDock::NickListDock();
+  // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
 
   // attach the NickListWidget to the BufferModel and the default selection
   nickListWidget->setModel(Client::bufferModel());
@@ -484,7 +488,8 @@ void MainWin::setDisconnectedState() {
 
 AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
 #ifdef SPUTDEV
-  return new ChatLine(msg);
+  //return new ChatLine(msg);
+  return 0;
 #else
   return new ChatLineOld(msg);
 #endif