Don't reset Urlbar.secure on uri changedont-reset-secure-but-icon

Update the icon instead so the caller doesn't have to know
in what order state is updated.

1 files changed, 11 insertions, 7 deletions

diff --git a/core/urlbar.vala b/core/urlbar.vala
index 7f54cb88..3a211d27 100644
--- a/core/urlbar.vala
+++ b/core/urlbar.vala
@@ -23,17 +23,12 @@ namespace Midori {
             location = value;
             // Treat about:blank specially
             text = blank ? "" : value;
-            secure = false;
+            update_icon ();
         } }
         bool _secure = false;
         public bool secure { get { return _secure; } set {
             _secure = value;
-            if (blank) {
-                primary_icon_name = null;
-            } else {
-                primary_icon_name = value ? "channel-secure-symbolic" : "channel-insecure-symbolic";
-            }
-            primary_icon_activatable = !blank;
+            update_icon ();
         } }
         bool blank { get { return uri == "about:blank" || uri == "internal:speed-dial"; } }
 
@@ -291,6 +286,15 @@ namespace Midori {
             suggestions.grab_focus ();
         }
 
+        void update_icon () {
+            if (blank) {
+                primary_icon_name = null;
+            } else {
+                primary_icon_name = secure ? "channel-secure-symbolic" : "channel-insecure-symbolic";
+            }
+            primary_icon_activatable = !blank;
+        }
+
         void icon_pressed (Gtk.EntryIconPosition position, Gdk.Event event) {
             TlsCertificate tls;
             TlsCertificateFlags flags;