diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-28 19:24:19 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-28 19:24:19 +0200 |
commit | f0c11eadaa4b77a4e36130b014b62cd6200c8211 (patch) | |
tree | 556625dc98766a444ea2b916e76446c2cb379357 /src/mainwindow.cpp | |
parent | Merge commit 'refs/merge-requests/192' of git://gitorious.org/rekonq/mainline (diff) | |
download | rekonq-f0c11eadaa4b77a4e36130b014b62cd6200c8211.tar.xz |
Switching to "KDE" icon cache. While this "brute force" change can be dangerous,
it seems let everything work as expected (at least here).
It also lets us to retrieve icons when sites are not visited (eg: search engines or old bookmarks)
It also contains fixes & improvements for icons management in History & Bookmarks classes.
More code to maintain, but more things working.Let's see what'll happen...
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r-- | src/mainwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 44cc6d59..5bacb699 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -50,6 +50,7 @@ #include "tabbar.h" #include "adblockmanager.h" #include "analyzerpanel.h" +#include "iconmanager.h" // Ui Includes #include "ui_cleardata.h" @@ -1233,7 +1234,7 @@ void MainWindow::aboutToShowBackMenu() QWebHistoryItem item = history->currentItem(); KAction *action = new KAction(this); action->setData(listCount + offset++); - KIcon icon = Application::icon(item.url()); + KIcon icon = Application::iconManager()->iconForUrl(item.url()); action->setIcon(icon); action->setText(item.title()); m_historyBackMenu->addAction(action); @@ -1244,7 +1245,7 @@ void MainWindow::aboutToShowBackMenu() QWebHistoryItem item = historyList.at(i); KAction *action = new KAction(this); action->setData(i + offset); - KIcon icon = Application::icon(item.url()); + KIcon icon = Application::iconManager()->iconForUrl(item.url()); action->setIcon(icon); action->setText(item.title()); m_historyBackMenu->addAction(action); |