3 files changed, 51 insertions, 13 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index 35e16d9a..fe2ca47a 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -83,6 +83,10 @@ int cmpTitleAscending_Bookmark(const iBookmark **a, const iBookmark **b) {
     return cmpStringCase_String(&(*a)->title, &(*b)->title);
 }
 
+iBool filterInsideFolder_Bookmark(void *context, const iBookmark *bm) {
+    return hasParent_Bookmark(bm, id_Bookmark(context));
+}
+
 /*----------------------------------------------------------------------------------------------*/
 
 static const char *oldFileName_Bookmarks_ = "bookmarks.txt";
@@ -345,16 +349,9 @@ iBool remove_Bookmarks(iBookmarks *d, uint32_t id) {
     lock_Mutex(d->mtx);
     iBookmark *bm = (iBookmark *) remove_Hash(&d->bookmarks, id);
     if (bm) {
-        /* If this is a remote source, make sure all the remote bookmarks are
-           removed as well. */
-        if (hasTag_Bookmark(bm, remoteSource_BookmarkTag)) {
-            iForEach(Hash, i, &d->bookmarks) {
-                iBookmark *j = (iBookmark *) i.value;
-                if (j->parentId == id_Bookmark(bm)) {
-                    remove_HashIterator(&i);
-                    delete_Bookmark(j);
-                }
-            }
+        /* Remove all the contained bookmarks as well. */
+        iConstForEach(PtrArray, i, list_Bookmarks(d, NULL, filterInsideFolder_Bookmark, bm)) {
+            delete_Bookmark((iBookmark *) remove_Hash(&d->bookmarks, id_Bookmark(i.ptr)));
         }
         delete_Bookmark(bm);
     }
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 61a5c102..13501ded 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -56,6 +56,7 @@ struct Impl_Bookmark {
 iLocalDef uint32_t  id_Bookmark         (const iBookmark *d) { return d->node.key; }
 iLocalDef iBool     isFolder_Bookmark   (const iBookmark *d) { return isEmpty_String(&d->url); }
 
+iBool   hasParent_Bookmark  (const iBookmark *, uint32_t parentId);
 int     depth_Bookmark      (const iBookmark *);
 iBool   hasTag_Bookmark     (const iBookmark *, const char *tag);
 void    addTag_Bookmark     (iBookmark *, const char *tag);
@@ -78,6 +79,8 @@ iLocalDef void addOrRemoveTag_Bookmark(iBookmark *d, const char *tag, iBool add)
 int     cmpTitleAscending_Bookmark      (const iBookmark **, const iBookmark **);
 int     cmpTree_Bookmark                (const iBookmark **, const iBookmark **);
 
+iBool   filterInsideFolder_Bookmark     (void *parentFolder, const iBookmark *);
+
 /*----------------------------------------------------------------------------------------------*/
 
 iDeclareType(Bookmarks)
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index e8aa69c1..8e38dcb8 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1111,6 +1111,16 @@ static void bookmarkMovedOntoFolder_SidebarWidget_(iSidebarWidget *d, size_t ind
     postCommand_App("bookmarks.changed");
 }
 
+static size_t numBookmarks_(const iPtrArray *bmList) {
+    size_t num = 0;
+    iConstForEach(PtrArray, i, bmList) {
+        if (!isFolder_Bookmark(i.ptr) && !hasTag_Bookmark(i.ptr, remote_BookmarkTag)) {
+            num++;
+        }
+    }
+    return num;
+}
+
 static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     /* Handle commands. */
@@ -1313,9 +1323,37 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         }
         else if (isCommand_Widget(w, ev, "bookmark.delete")) {
             const iSidebarItem *item = d->contextItem;
-            if (d->mode == bookmarks_SidebarMode && item && remove_Bookmarks(bookmarks_App(), item->id)) {
-                removeEntries_Feeds(item->id);
-                postCommand_App("bookmarks.changed");
+            if (d->mode == bookmarks_SidebarMode && item) {
+                iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
+                if (isFolder_Bookmark(bm)) {
+                    const iPtrArray *list = list_Bookmarks(bookmarks_App(), NULL,
+                                                           filterInsideFolder_Bookmark, bm);
+                    if (argLabel_Command(cmd, "confirmed") || isEmpty_PtrArray(list)) {
+                        iConstForEach(PtrArray, i, list) {
+                            removeEntries_Feeds(id_Bookmark(i.ptr));
+                        }
+                        remove_Bookmarks(bookmarks_App(), item->id);
+                        postCommand_App("bookmarks.changed");
+                    }
+                    else {
+                        const size_t numBookmarks = numBookmarks_(list);
+                        makeQuestion_Widget(uiHeading_ColorEscape "${heading.confirm.bookmarks.delete}",
+                                            formatCStrs_Lang("dlg.confirm.bookmarks.delete.n", numBookmarks),
+                                            (iMenuItem[]){
+                            { "${cancel}" },
+                            { format_CStr(uiTextCaution_ColorEscape "%s",
+                                          formatCStrs_Lang("dlg.bookmarks.delete.n", numBookmarks)),
+                                          0, 0, format_CStr("!bookmark.delete confirmed:1 ptr:%p", d) },
+                        }, 2);
+                    }
+                }
+                else {
+                    /* TODO: Move it to a Trash folder? */
+                    if (remove_Bookmarks(bookmarks_App(), item->id)) {
+                        removeEntries_Feeds(item->id);
+                        postCommand_App("bookmarks.changed");
+                    }
+                }
             }
             return iTrue;
         }