summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authormegabigbug <megabigbug@arrakis.(none)>2010-03-26 23:06:48 +0100
committermegabigbug <megabigbug@arrakis.(none)>2010-03-26 23:06:48 +0100
commit4f0377e06e824ecfa7a8e106d80ca95760114b85 (patch)
treee09805220edc36f8892033a65f6cf2f1c6f119c8 /src/mainwindow.cpp
parentRevert "derivation of the lastbar branch: UltimateLastBar :)" (diff)
parentrekonq 0.4.55 (diff)
downloadrekonq-4f0377e06e824ecfa7a8e106d80ca95760114b85.tar.xz
Merge branch 'master' of git://gitorious.org/rekonq/mainline
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 68469cdd..6a17d1b8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1009,12 +1009,19 @@ void MainWindow::openPrevious(Qt::MouseButtons btn)
QWebHistory *history = currentTab()->view()->history();
if (history->canGoBack())
{
- KUrl back = history->backItem().url();
if(btn == Qt::MidButton)
+ {
+ KUrl back = history->backItem().url();
Application::instance()->loadUrl(back, Rekonq::SettingOpenTab);
+ }
else
- Application::instance()->loadUrl(back);
+ {
+ history->goToItem(history->backItem());
+ }
+
+ updateActions();
}
+
}
@@ -1023,11 +1030,16 @@ void MainWindow::openNext(Qt::MouseButtons btn)
QWebHistory *history = currentTab()->view()->history();
if (history->canGoForward())
{
- KUrl next = history->forwardItem().url();
if(btn == Qt::MidButton)
+ {
+ KUrl next = history->forwardItem().url();
Application::instance()->loadUrl(next, Rekonq::SettingOpenTab);
+ }
else
- Application::instance()->loadUrl(next);
+ {
+ history->goToItem(history->forwardItem());
+ }
+ updateActions();
}
}