From b7936c6a4c8bc01a87bcb38dd8a2ad5660e6282b Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Fri, 16 Sep 2011 00:13:03 +0000
Subject: don't change the page when given a blank URL

---
 src/variables.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/variables.c b/src/variables.c
index 8f4f611..8ba2785 100644
--- a/src/variables.c
+++ b/src/variables.c
@@ -263,18 +263,18 @@ uri_change_cb (WebKitWebView *web_view, GParamSpec param_spec) {
 }
 
 void
-set_uri(const gchar *val) {
-    g_free(uzbl.state.uri);
-    uzbl.state.uri = g_strdup(val);
-    const gchar *uri = uzbl.state.uri;
-
-    gchar   *newuri;
-    SoupURI *soup_uri;
-
-    /* Strip leading whitespaces */
+set_uri(const gchar *uri) {
+    /* Strip leading whitespace */
     while (*uri && isspace(*uri))
         uri++;
 
+    /* don't do anything when given a blank URL */
+    if(uri[0] == 0)
+        return;
+
+    g_free(uzbl.state.uri);
+    uzbl.state.uri = g_strdup(uri);
+
     /* evaluate javascript: URIs */
     if (!strncmp (uri, "javascript:", 11)) {
         eval_js(uzbl.gui.web_view, uri, NULL, "javascript:");
@@ -282,7 +282,8 @@ set_uri(const gchar *val) {
     }
 
     /* attempt to parse the URI */
-    soup_uri = soup_uri_new(uri);
+    gchar   *newuri;
+    SoupURI *soup_uri = soup_uri_new(uri);
 
     if (!soup_uri) {
         /* it's not a valid URI, maybe it's a path on the filesystem. */
@@ -311,8 +312,8 @@ set_uri(const gchar *val) {
     }
 
     set_window_property("UZBL_URI", newuri);
-
     webkit_web_view_load_uri (uzbl.gui.web_view, newuri);
+
     g_free (newuri);
 }
 
-- 
cgit v1.2.3