Canonical URIs

Internally, all URIs should be converted to a canonical form so that they can be compared against each other.

The canonical form is an IRI with spaces and reserved characters percent-encoded.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index c0a22e99..4c2a9d64 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -217,7 +217,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
     iBool isEmpty = iFalse; /* show blank? */
     switch (d->mode) {
         case feeds_SidebarMode: {
-            const iString *docUrl = withSpacesEncoded_String(url_DocumentWidget(document_App()));
+            const iString *docUrl = canonicalUrl_String(url_DocumentWidget(document_App()));
                                     /* TODO: internal URI normalization */
             iTime now;
             iDate on;
@@ -1111,7 +1111,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (isCommand_Widget(w, ev, "bookmark.copy")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
-                SDL_SetClipboardText(cstr_String(withSpacesEncoded_String(&item->url)));
+                SDL_SetClipboardText(cstr_String(canonicalUrl_String(&item->url)));
             }
             return iTrue;
         }
@@ -1374,7 +1374,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (isCommand_Widget(w, ev, "history.copy")) {
             const iSidebarItem *item = d->contextItem;
             if (item && !isEmpty_String(&item->url)) {
-                SDL_SetClipboardText(cstr_String(withSpacesEncoded_String(&item->url)));
+                SDL_SetClipboardText(cstr_String(canonicalUrl_String(&item->url)));
             }
             return iTrue;
         }