diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:32:28 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:32:28 +0200 |
| commit | a4c70a0ffdba0c84664944645b12778f5142320b (patch) | |
| tree | 3087d9447698506dfa61d4f5b6b190f1b15f5616 /src/urlbar | |
| parent | Code Review. (diff) | |
| parent | Fix compile again ... (diff) | |
| download | rekonq-a4c70a0ffdba0c84664944645b12778f5142320b.tar.xz | |
Merge commit 'refs/merge-requests/197' of git://gitorious.org/rekonq/mainline into m197
Conflicts:
src/bookmarks/bookmarkprovider.h
I also changed a iconmanager header inclusion :)
Diffstat (limited to 'src/urlbar')
| -rw-r--r-- | src/urlbar/urlbar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index f1729d53..25c7b748 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -42,11 +42,11 @@ #include "webview.h" #include "completionwidget.h" #include "bookmarkprovider.h" +#include "bookmarkowner.h" #include "bookmarkwidget.h" #include "iconmanager.h" // KDE Includes -#include <KBookmarkManager> #include <KCompletionBox> #include <KStandardDirs> @@ -356,8 +356,7 @@ void UrlBar::showBookmarkInfo(const QPoint &pos) if (bookmark.isNull()) { - bookmark = Application::bookmarkProvider()->rootGroup().addBookmark(_tab->view()->title(), _tab->url()); - Application::bookmarkProvider()->bookmarkManager()->emitChanged(); + bookmark = Application::bookmarkProvider()->bookmarkOwner()->bookmarkCurrentPage(); } BookmarkWidget *widget = new BookmarkWidget(bookmark, window()); |