Update bookmark icons when opening pages

If bookmarks are imported or added manually, they won't have the correct site icons. Whenever a page is loaded the bookmark icon is now updated.

4 files changed, 28 insertions, 0 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index e54c6239..7cf7f5a1 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -216,6 +216,23 @@ iBool remove_Bookmarks(iBookmarks *d, uint32_t id) {
     return bm != NULL;
 }
 
+iBool updateBookmarkIcon_Bookmarks(iBookmarks *d, const iString *url, iChar icon) {
+    iBool changed = iFalse;
+    lock_Mutex(d->mtx);
+    const uint32_t id = findUrl_Bookmarks(d, url);
+    if (id) {
+        iBookmark *bm = get_Bookmarks(d, id);
+        if (!hasTag_Bookmark(bm, "remote")) {
+            if (icon != bm->icon) {
+                bm->icon = icon;
+                changed = iTrue;
+            }
+        }
+    }
+    unlock_Mutex(d->mtx);
+    return changed;
+}
+
 iBookmark *get_Bookmarks(iBookmarks *d, uint32_t id) {
     return (iBookmark *) value_Hash(&d->bookmarks, id);
 }
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 2975b082..26bd9a47 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -62,6 +62,7 @@ void        requestFinished_Bookmarks   (iBookmarks *, iGmRequest *req);
 void        add_Bookmarks       (iBookmarks *, const iString *url, const iString *title,
                                  const iString *tags, iChar icon);
 iBool       remove_Bookmarks    (iBookmarks *, uint32_t id);
+iBool       updateBookmarkIcon_Bookmarks    (iBookmarks *, const iString *url, iChar icon);
 iBookmark * get_Bookmarks       (iBookmarks *, uint32_t id);
 uint32_t    findUrl_Bookmarks   (const iBookmarks *, const iString *url); /* O(n) */
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index bc9dbc8d..0723ed9d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1181,6 +1181,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     "document.input.submit");
                 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"),
                                                 statusCode == sensitiveInput_GmStatusCode);
+                updateTheme_DocumentWidget_(d);
                 break;
             }
             case categorySuccess_GmStatusCode:
diff --git a/src/ui/window.c b/src/ui/window.c
index e1bb1c0b..2933a47d 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -27,6 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "documentwidget.h"
 #include "sidebarwidget.h"
 #include "lookupwidget.h"
+#include "bookmarks.h"
 #include "embedded.h"
 #include "command.h"
 #include "paint.h"
@@ -396,6 +397,14 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                 setText_InputWidget(url, urlStr);
                 checkLoadAnimation_Window_(get_Window());
                 updateNavBarIdentity_(navBar);
+                /* Icon updates should be limited to automatically chosen icons if the user
+                   is allowed to pick their own in the future. */
+                if (updateBookmarkIcon_Bookmarks(
+                    bookmarks_App(),
+                    urlStr,
+                        siteIcon_GmDocument(document_DocumentWidget(document_App())))) {
+                    postCommand_App("bookmarks.changed");
+                }
                 return iFalse;
             }
             else if (equal_Command(cmd, "document.request.cancelled")) {