From 2d52276803a4145546f74d5d179091667e9186ab Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 11 Sep 2010 12:09:47 +0200 Subject: This commit aims to fix all troubles with favicons retrieving. There is at least just another one about threading. But I'm not 100% sure about. And anyway, it will be eventually addressed after 0.6 release.. --- src/bookmarks/bookmarkowner.cpp | 3 +-- src/bookmarks/bookmarkprovider.cpp | 2 +- src/bookmarks/bookmarkstoolbar.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/bookmarks') diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 8a05d646..e1b9a567 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -195,8 +195,7 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) else parent = selected.parentGroup(); - newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl()), - Application::iconManager()->iconForUrl(currentUrl()).name()); + newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl()) ); parent.moveBookmark(newBk, selected); } else diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index 7cd48825..3e2d2814 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -237,7 +237,7 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar) { KBookmarkAction *action = new KBookmarkAction(bookmark, m_owner, this); action->setIconText(action->iconText().replace('&', "&&")); - action->setIcon(Application::iconManager()->iconForUrl(bookmark.url())); + action->setIcon(Application::iconManager()->iconForUrl( KUrl(bookmark.url()) )); connect(action, SIGNAL(hovered()), toolBar, SLOT(actionHovered())); toolBar->toolBar()->addAction(action); toolBar->toolBar()->widgetForAction(action)->installEventFilter(toolBar); diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 77bff7e6..4eff2e52 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -91,7 +91,7 @@ QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark) else { KBookmarkAction *action = new KBookmarkAction(bookmark, owner(), this); - action->setIcon(Application::iconManager()->iconForUrl(bookmark.url())); + action->setIcon(Application::iconManager()->iconForUrl( KUrl(bookmark.url()) )); connect(action, SIGNAL(hovered()), this, SLOT(actionHovered())); return action; } -- cgit v1.2.1