Improved Identity management via sidebar

Prevent redundant activations: the highest-level URL overrides the
same identity being used on lower-level URLs. Changed the icons in
the list and added the list of used URLs into the context menu as
clickable items.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/gmcerts.c b/src/gmcerts.c
index 35d784f6..f86712ac 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -105,7 +105,7 @@ void deserialize_GmIdentity(iGmIdentity *d, iStream *ins) {
         iString url;
         init_String(&url);
         deserialize_String(&url, ins);
-        insert_StringSet(d->useUrls, &url);
+        setUse_GmIdentity(d, &url, iTrue);
         deinit_String(&url);
     }
 }
@@ -166,6 +166,15 @@ void setUse_GmIdentity(iGmIdentity *d, const iString *url, iBool use) {
         return; /* Redudant. */
     }
     if (use) {
+        /* Remove all use-URLs that become redundant by this newly added URL. */
+        /* TODO: StringSet could have a non-const iterator. */
+        iForEach(Array, i, &d->useUrls->strings.values) {
+            iString *used = i.value;
+            if (startsWithCase_String(used, cstr_String(url))) {
+                deinit_String(used);
+                remove_ArrayIterator(&i);
+            }
+        }
 #if !defined (NDEBUG)
         const iBool wasInserted =
 #endif