X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fmainwin.cpp;h=24b89dce985b6710083b50b44724f7eb18b31c2d;hb=f7e987956ef7e469a493a669e2f0c0901f5a7ead;hp=3c0c702ba37ceeba8a2755aa21470d918c0b669a;hpb=9996d2489e5e5ca23b0750f39f64d8d4b5990029;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 3c0c702b..24b89dce 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -18,11 +18,12 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "mainwin.h"
-#include <QDir>
+
 #include "aboutdlg.h"
 #include "action.h"
 #include "actioncollection.h"
 #include "buffermodel.h"
+#include "bufferview.h"
 #include "bufferviewmanager.h"
 #include "bufferwidget.h"
 #include "channellistdlg.h"
@@ -279,7 +280,7 @@ void MainWin::addBufferView(BufferViewConfig *config) {
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   _bufferViewsMenu->addAction(dock->toggleViewAction());
 
-  _netViews.append(dock);
+  _bufferViews.append(dock);
 }
 
 void MainWin::removeBufferView(int bufferViewConfigId) {
@@ -298,6 +299,13 @@ void MainWin::removeBufferView(int bufferViewConfigId) {
   }
 }
 
+BufferView *MainWin::allBuffersView() const {
+  // "All Buffers" is always the first dock created
+  if(_bufferViews.count() > 0)
+    return _bufferViews[0]->bufferView();
+  return 0;
+}
+
 void MainWin::on_actionEditNetworks_triggered() {
   SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
   dlg.exec();
@@ -473,9 +481,8 @@ void MainWin::connectedToCore() {
   connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigAdded(int)), this, SLOT(addBufferView(int)));
   connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int)));
   connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout()));
-
+  
   setConnectedState();
-  Client::backlogManager()->requestInitialBacklog();
 }
 
 void MainWin::setConnectedState() {
@@ -569,7 +576,7 @@ void MainWin::showCoreInfoDlg() {
 }
 
 void MainWin::showSettingsDlg() {
-  SettingsDlg *dlg = new SettingsDlg(this);
+  SettingsDlg *dlg = new SettingsDlg();
 
   //Category: Appearance
   dlg->registerSettingsPage(new ColorSettingsPage(dlg));