1 files changed, 6 insertions, 21 deletions

diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp
index 96668003..714c8b51 100644
--- a/src/bookmarks/bookmarkcontextmenu.cpp
+++ b/src/bookmarks/bookmarkcontextmenu.cpp
@@ -212,25 +212,7 @@ void BookmarkContextMenu::copyToClipboard()
 void BookmarkContextMenu::deleteBookmark()
 {
     KBookmark bm = bookmark();
-    KBookmarkGroup bmg = bm.parentGroup();
-    bool folder = bm.isGroup();
-    QString name = QString(bm.fullText()).replace("&&", "&");
-
-    if (KMessageBox::warningContinueCancel(
-                QApplication::activeWindow(),
-                folder ? i18n("Are you sure you wish to remove the bookmark folder\n\"%1\"?", name)
-                : i18n("Are you sure you wish to remove the bookmark\n\"%1\"?", name),
-                folder ? i18n("Bookmark Folder Deletion")
-                : i18n("Bookmark Deletion"),
-                KStandardGuiItem::del(),
-                KStandardGuiItem::cancel(),
-                "bookmarkDeletition_askAgain")
-            != KMessageBox::Continue
-       )
-        return;
-
-    bmg.deleteBookmark(bm);
-    manager()->emitChanged(bmg);
+    Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark(bm);
 }
 
 
@@ -268,8 +250,11 @@ void BookmarkContextMenu::newBookmarkGroup()
         {
             KBookmark newBk;
             newBk = dialog->createNewFolder("New folder", selected.parentGroup());
-            selected.parentGroup().moveBookmark(newBk, selected);
-            manager()->emitChanged(newBk.parentGroup());
+            if (!newBk.isNull())
+            {
+                selected.parentGroup().moveBookmark(newBk, selected);
+                manager()->emitChanged(newBk.parentGroup());
+            }
         }
     }
     else