Deleting bookmarks

4 files changed, 18 insertions, 15 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index 96a2b6a0..29b3d836 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -118,8 +118,13 @@ void add_Bookmarks(iBookmarks *d, const iString *url, const iString *title, cons
     insert_Bookmarks_(d, bm);
 }
 
-void remove_Bookmarks(iBookmarks *d, uint32_t id) {
-    delete_Bookmark((iBookmark *) remove_Hash(&d->bookmarks, id));
+iBool remove_Bookmarks(iBookmarks *d, uint32_t id) {
+    iBookmark *bm = (iBookmark *) remove_Hash(&d->bookmarks, id);
+    if (bm) {
+        delete_Bookmark(bm);
+        return iTrue;
+    }
+    return iFalse;
 }
 
 const iPtrArray *list_Bookmarks(const iBookmarks *d, iBookmarksFilterFunc filter,
diff --git a/src/bookmarks.h b/src/bookmarks.h
index e1f517ad..336e542a 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -27,7 +27,7 @@ void    load_Bookmarks      (iBookmarks *, const char *dirPath);
 void    save_Bookmarks      (const iBookmarks *, const char *dirPath);
 
 void    add_Bookmarks       (iBookmarks *, const iString *url, const iString *title, const iString *tags, iChar icon);
-void    remove_Bookmarks    (iBookmarks *, uint32_t id);
+iBool   remove_Bookmarks    (iBookmarks *, uint32_t id);
 
 typedef iBool (*iBookmarksFilterFunc) (const iBookmark *);
 typedef int   (*iBookmarksCompareFunc)(const iBookmark **, const iBookmark **);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index b8e29a7d..78227cf3 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -15,20 +15,18 @@
 iDeclareType(SidebarItem)
 
 struct Impl_SidebarItem {
+    uint32_t    id;
     int         indent;
     iChar       icon;
     iString     label;
     iString     meta;
     iString     url;
-    size_t      index;
-    const void *src;
 };
 
 void init_SidebarItem(iSidebarItem *d) {
+    d->id     = 0;
     d->indent = 0;
     d->icon   = 0;
-    d->index  = 0;
-    d->src    = NULL;
     init_String(&d->label);
     init_String(&d->meta);
     init_String(&d->url);
@@ -110,7 +108,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 const iGmHeading *head = i.value;
                 iSidebarItem item;
                 init_SidebarItem(&item);
-                item.index = index_ArrayConstIterator(&i);
+                item.id = index_ArrayConstIterator(&i);
                 setRange_String(&item.label, head->text);
                 item.indent = head->level * 4 * gap_UI;
                 pushBack_Array(&d->items, &item);
@@ -122,6 +120,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 const iBookmark *bm = i.ptr;
                 iSidebarItem item;
                 init_SidebarItem(&item);
+                item.id = id_Bookmark(bm);
                 item.icon = bm->icon;
                 set_String(&item.url, &bm->url);
                 set_String(&item.label, &bm->title);
@@ -129,7 +128,6 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 init_Date(&date, &bm->when);
                 iString *ds = format_Date(&date, "%Y %b %d");
                 set_String(&item.meta, ds);
-                item.src = bm;
                 delete_String(ds);
                 pushBack_Array(&d->items, &item);
             }
@@ -251,7 +249,7 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, size_t index) {
     switch (d->mode) {
         case documentOutline_SidebarMode: {
             const iGmDocument *doc = document_DocumentWidget(document_App());
-            const iGmHeading *head = constAt_Array(headings_GmDocument(doc), item->index);
+            const iGmHeading *head = constAt_Array(headings_GmDocument(doc), item->id);
             postCommandf_App("document.goto loc:%p", head->text.start);
             break;
         }
@@ -367,8 +365,12 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         }
         else if (equal_Command(cmd, "bookmark.delete")) {
             if (d->mode == bookmarks_SidebarMode && d->hoverItem < size_Array(&d->items)) {
-
+                const iSidebarItem *item = at_Array(&d->items, d->hoverItem);
+                if (remove_Bookmarks(bookmarks_App(), item->id)) {
+                    postCommand_App("bookmarks.changed");
+                }
             }
+            return iTrue;
         }
         else if (equal_Command(cmd, "bookmarks.changed")) {
             updateItems_SidebarWidget_(d);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index cfd8304b..4dd847c7 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -412,10 +412,6 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
             }
         }
         if (class_Widget(d)->processEvent(d, ev)) {
-            if (ev->type == SDL_MOUSEBUTTONDOWN) {
-                printf("mb.down eaten by %p '%s'\n", d, cstr_String(id_Widget(d)));
-                fflush(stdout);
-            }
             return iTrue;
         }
     }