From ff8ea24c948a3f3a8e8f1652f3a6a95fc57275a8 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 14 Dec 2009 00:07:05 +0100
Subject: Moved url storing operation (add to history) in the loadUrl function,
 after uri filters. This way we stored everytime the "real" url we load :)

---
 src/application.cpp   |  3 +++
 src/urlbar/urlbar.cpp | 13 +++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 246d6aa5..cf77be57 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -347,6 +347,9 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
     }
     // ------------------- END WARNING --------------------------------------
 
+    // we are sure of the url now, let's add it to history
+    historyManager()->addHistoryEntry( loadingUrl.prettyUrl() );
+    
     if (!ReKonfig::openTabsBack())
     {
         w->mainView()->urlBar()->setUrl(loadingUrl.prettyUrl());
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index e9952c01..be19dae4 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -33,10 +33,10 @@
 
 // Local Includes
 #include "application.h"
-#include "historymodels.h"
 #include "lineedit.h"
 #include "mainwindow.h"
 #include "webview.h"
+#include "historymanager.h"
 
 // KDE Includes
 #include <KDebug>
@@ -44,9 +44,10 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPalette>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPalette>
+#include <QTimer>
 
 
 QColor UrlBar::s_defaultBaseColor;
@@ -203,9 +204,6 @@ void UrlBar::activated(const QString& urlString)
         return;
 
     setUrl(urlString);
-
-    Application::historyManager()->addHistoryEntry(urlString);
-
     emit activated(m_currentUrl);
 }
 
@@ -214,7 +212,6 @@ void UrlBar::cleared()
 {
     // clear the history on user's request from context menu
     clear();
-    Application::historyManager()->clear();
 }
 
 
-- 
cgit v1.2.1