diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:15:23 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:15:23 +0200 |
commit | 52bf222bf033f6bbcd15cfe2012a51a194d475d8 (patch) | |
tree | d2e839ccbdf38c930d145d4d8dd23897bbc43666 /src/urlbar | |
parent | Krazy fixes, first bunch (diff) | |
parent | - The bookmark toolbar is now a real toolbar, not an action. (diff) | |
download | rekonq-52bf222bf033f6bbcd15cfe2012a51a194d475d8.tar.xz |
Merge commit 'refs/merge-requests/181' of git://gitorious.org/rekonq/mainline into m181
Conflicts:
src/bookmarks/bookmarkstoolbar.h
Diffstat (limited to 'src/urlbar')
-rw-r--r-- | src/urlbar/bookmarkwidget.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp index 5a2e6434..bcf85e1f 100644 --- a/src/urlbar/bookmarkwidget.cpp +++ b/src/urlbar/bookmarkwidget.cpp @@ -153,7 +153,6 @@ void BookmarkWidget::showAt(const QPoint &pos) void BookmarkWidget::removeBookmark() { - Application::bookmarkProvider()->bookmarkOwner()->bookmarkSelected(m_bookmark); - Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark(); + Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark(m_bookmark); reject(); } |