diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-18 10:48:06 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-18 10:48:06 +0200 |
commit | 27209e691c57cdd380cee8385c0127c9f838fbd8 (patch) | |
tree | 9b19e466938118a7202cbf77a4c239b2ca73331e /src/urlbar/bookmarkwidget.cpp | |
parent | Fix tools & bookmarks shortcuts behavior (diff) | |
parent | - Adapt removeBookmark to Jon's new method (diff) | |
download | rekonq-27209e691c57cdd380cee8385c0127c9f838fbd8.tar.xz |
Merge commit 'refs/merge-requests/174' of git://gitorious.org/rekonq/mainline into m174
Diffstat (limited to 'src/urlbar/bookmarkwidget.cpp')
-rw-r--r-- | src/urlbar/bookmarkwidget.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp index 3380ec57..ccfe4914 100644 --- a/src/urlbar/bookmarkwidget.cpp +++ b/src/urlbar/bookmarkwidget.cpp @@ -152,21 +152,6 @@ void BookmarkWidget::showAt(const QPoint &pos) void BookmarkWidget::removeBookmark() { - bool folder = m_bookmark.isGroup(); - - if (KMessageBox::warningContinueCancel( - QApplication::activeWindow(), - folder ? i18n("Are you sure you wish to remove the bookmark folder\n\"%1\"?", m_bookmark.text()) - : i18n("Are you sure you wish to remove the bookmark\n\"%1\"?", m_bookmark.text()), - folder ? i18n("Bookmark Folder Deletion") - : i18n("Bookmark Deletion"), - KStandardGuiItem::del()) - == KMessageBox::Continue - ) - { - m_bookmark.parentGroup().deleteBookmark(m_bookmark); - Application::bookmarkProvider()->bookmarkManager()->emitChanged(); - } - + Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark(m_bookmark); reject(); } |