From 56057b46f9edbee6c2dcd6e6a4e2e2301a6f5c91 Mon Sep 17 00:00:00 2001
From: Mason Larobina <mason.larobina@gmail.com>
Date: Sun, 21 Mar 2010 19:11:09 +0800
Subject: Make the `uri` command a wrapper around `set uri = ..`

---
 src/callbacks.c | 3 +--
 src/callbacks.h | 3 +--
 src/events.c    | 7 +++----
 src/events.h    | 2 +-
 src/uzbl-core.c | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/callbacks.c b/src/callbacks.c
index 145bc19..ac6c75d 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -311,7 +311,7 @@ cmd_view_source() {
 
 void
 cmd_set_zoom_type () {
-    if(uzbl.behave.zoom_type) 
+    if(uzbl.behave.zoom_type)
         webkit_web_view_set_full_content_zoom (uzbl.gui.web_view, TRUE);
     else
         webkit_web_view_set_full_content_zoom (uzbl.gui.web_view, FALSE);
@@ -762,4 +762,3 @@ populate_popup_cb(WebKitWebView *v, GtkMenu *m, void *c) {
         }
     }
 }
-
diff --git a/src/callbacks.h b/src/callbacks.h
index 6ed8986..278a31a 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -1,4 +1,4 @@
-/* 
+/*
  ** Callbacks
  ** (c) 2009 by Robert Manea et al.
 */
@@ -207,4 +207,3 @@ button_release_cb (GtkWidget* window, GdkEventButton* event);
 
 gboolean
 focus_cb(GtkWidget* window, GdkEventFocus* event, void *ud);
-
diff --git a/src/events.c b/src/events.c
index 1028c30..c209550 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,5 +1,5 @@
-/* 
- ** Uzbl event routines 
+/*
+ ** Uzbl event routines
  ** (c) 2009 by Robert Manea
 */
 
@@ -84,7 +84,7 @@ send_event_socket(GString *msg) {
                                 tmp->str, tmp->len,
                                 &len, &error);
 
-                        if (ret == G_IO_STATUS_ERROR) 
+                        if (ret == G_IO_STATUS_ERROR)
                             g_warning ("Error sending event to socket: %s", error->message);
                         else
                             g_io_channel_flush(gio, &error);
@@ -205,4 +205,3 @@ key_to_event(guint keyval, gint mode) {
     }
 
 }
-
diff --git a/src/events.h b/src/events.h
index fe3ff3b..1bd8804 100644
--- a/src/events.h
+++ b/src/events.h
@@ -1,4 +1,4 @@
-/*  
+/*
  ** Uzbl event routines
  ** (c) 2009 by Robert Manea
 */
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index d449ab3..bf3fbb5 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -997,7 +997,7 @@ act_dump_config_as_events() {
 void
 load_uri (WebKitWebView *web_view, GArray *argv, GString *result) {
     (void) web_view; (void) result;
-    load_uri_imp (argv_idx (argv, 0));
+    set_var_value("uri", argv_idx(argv, 0));
 }
 
 /* Javascript*/
-- 
cgit v1.2.3