From: Daniel Carl <danielcarl@gmx.de>
Date: Mon, 7 Jan 2013 18:51:21 +0000 (+0100)
Subject: Don't set vp_update_status_style every time the statusbar is updated.
X-Git-Url: https://git.owens.tech/git.owens.tech/git.owens.tech/git?a=commitdiff_plain;h=ec4140096c39ec47fb97df32698b9d71ee15f8d0;p=vimb.git

Don't set vp_update_status_style every time the statusbar is updated.

The style depends only on the current ssl status, so it's enough to update if
we get a new status or if the color definitions are changed.
---

diff --git a/src/main.c b/src/main.c
index 142197e..3f1caa7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -70,6 +70,7 @@ static void vp_setup_settings(void);
 static void vp_set_cookie(SoupCookie* cookie);
 static const gchar* vp_get_cookies(SoupURI *uri);
 static gboolean vp_hide_message(void);
+static void vp_set_status(const StatusType status);
 
 static void vp_webview_progress_cb(WebKitWebView* view, GParamSpec* pspec, gboolean download)
 {
@@ -106,13 +107,17 @@ static void vp_webview_load_status_cb(WebKitWebView* view, GParamSpec* pspec, gp
                 WebKitWebDataSource* src      = webkit_web_frame_get_data_source(frame);
                 WebKitNetworkRequest* request = webkit_web_data_source_get_request(src);
                 SoupMessage* msg              = webkit_network_request_get_message(request);
-                vp.state.status = (soup_message_get_flags(msg) & SOUP_MESSAGE_CERTIFICATE_TRUSTED)
-                    ? VP_STATUS_SSL_VALID
-                    : VP_STATUS_SSL_INVALID;
+                SoupMessageFlags flags        = soup_message_get_flags(msg);
+                vp_set_status(
+                    (flags & SOUP_MESSAGE_CERTIFICATE_TRUSTED) ? VP_STATUS_SSL_VALID : VP_STATUS_SSL_INVALID
+                );
             } else {
-                vp.state.status = VP_STATUS_NORMAL;
+                vp_set_status(VP_STATUS_NORMAL);
             }
 
+            /* update the style of the status bar according to status */
+            vp_update_status_style();
+
             /* status bar is updated by vp_set_mode */
             vp_set_mode(VP_MODE_NORMAL , FALSE);
             vp_update_urlbar(uri);
@@ -389,6 +394,15 @@ static gboolean vp_hide_message(void)
     return FALSE;
 }
 
+static void vp_set_status(const StatusType status)
+{
+    if (vp.state.status != status) {
+        vp.state.status = status;
+        /* update the statusbar style only if the status changed */
+        vp_update_status_style();
+    }
+}
+
 /**
  * Set the base modes. All other mode flags like completion can be set directly
  * to vp.state.mode.
@@ -450,8 +464,6 @@ void vp_update_statusbar(void)
 {
     GString* status = g_string_new("");
 
-    vp_update_status_style();
-
     /* show current count */
     g_string_append_printf(status, "%.0d", vp.state.count);
     /* show current modkey */