From 09ba3b9c585ad397c3168d1fb44f7f4dc75f0447 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Mar 2010 00:52:07 +0100
Subject: Fix choice between history & bookmarks in the new tab first page. No
 more reloading pages on accepting configuration

---
 src/mainwindow.cpp      | 9 +--------
 src/mainwindow.h        | 1 -
 src/protocolhandler.cpp | 8 ++++----
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a02910fd..eebebc09 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -603,13 +603,6 @@ void MainWindow::updateConfiguration()
 }
 
 
-void MainWindow::updateBrowser()
-{
-    updateConfiguration();
-    mainView()->reloadAllTabs();
-}
-
-
 void MainWindow::openLocation()
 {
     m_view->urlBar()->selectAll();
@@ -646,7 +639,7 @@ void MainWindow::preferences()
     QWeakPointer<SettingsDialog> s = new SettingsDialog(this);
 
     // keep us informed when the user changes settings
-    connect(s.data(), SIGNAL(settingsChanged(const QString&)), this, SLOT(updateBrowser()));
+    connect(s.data(), SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration()));
 
     s.data()->exec();
     delete s.data();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 66c796cc..57b88dfd 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -87,7 +87,6 @@ private:
     void setupPanels();
     
 public slots:
-    void updateBrowser();
     void homePage();
 
     /**
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index ffeea562..70d69107 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -124,12 +124,12 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
             case 1: // closed tabs
                 _url = KUrl("about:closedTabs");
                 break;
-            case 2: // history
-                _url = KUrl("about:history");
-                break;
-            case 3: // bookmarks
+            case 2: // bookmarks
                 _url = KUrl("about:bookmarks");
                 break;
+            case 3: // history
+                _url = KUrl("about:history");
+                break;
             default: // unuseful
                 break;
             }
-- 
cgit v1.2.1