From 952ceba2183d781245236834dbabf4365b549b95 Mon Sep 17 00:00:00 2001
From: David Keijser <keijser@gmail.com>
Date: Mon, 30 May 2011 07:01:30 +0200
Subject: move uri_change_cb to variables

---
 src/callbacks.c | 9 ---------
 src/callbacks.h | 3 ---
 src/variables.c | 9 +++++++++
 src/variables.h | 2 ++
 4 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/callbacks.c b/src/callbacks.c
index 5bdcb55..ef2005d 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -93,15 +93,6 @@ load_error_cb (WebKitWebView* page, WebKitWebFrame* frame, gchar *uri, gpointer
     return FALSE;
 }
 
-void
-uri_change_cb (WebKitWebView *web_view, GParamSpec param_spec) {
-  (void) param_spec;
-
-  g_free (uzbl.state.uri);
-  g_object_get (web_view, "uri", &uzbl.state.uri, NULL);
-  g_setenv("UZBL_URI", uzbl.state.uri, TRUE);
-}
-
 void
 selection_changed_cb(WebKitWebView *webkitwebview, gpointer ud) {
     (void)ud;
diff --git a/src/callbacks.h b/src/callbacks.h
index 7af4332..176cb40 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -18,9 +18,6 @@ load_status_change_cb (WebKitWebView* web_view, GParamSpec param_spec);
 gboolean
 load_error_cb (WebKitWebView* page, WebKitWebFrame* frame, gchar *uri, gpointer web_err, gpointer ud);
 
-void
-uri_change_cb (WebKitWebView *web_view, GParamSpec param_spec);
-
 void
 selection_changed_cb(WebKitWebView *webkitwebview, gpointer ud);
 
diff --git a/src/variables.c b/src/variables.c
index 3488aa4..d1552f9 100644
--- a/src/variables.c
+++ b/src/variables.c
@@ -246,6 +246,15 @@ view_settings() {
     return G_OBJECT(webkit_web_view_get_settings(uzbl.gui.web_view));
 }
 
+void
+uri_change_cb (WebKitWebView *web_view, GParamSpec param_spec) {
+  (void) param_spec;
+
+  g_free (uzbl.state.uri);
+  g_object_get (web_view, "uri", &uzbl.state.uri, NULL);
+  g_setenv("UZBL_URI", uzbl.state.uri, TRUE);
+}
+
 void
 cmd_load_uri() {
     const gchar *uri = uzbl.state.uri;
diff --git a/src/variables.h b/src/variables.h
index 1b7663a..c289c44 100644
--- a/src/variables.h
+++ b/src/variables.h
@@ -6,6 +6,7 @@
 #define __VARIABLES__
 
 #include <glib.h>
+#include <webkit/webkit.h>
 #include "type.h"
 
 /* Uzbl variables */
@@ -27,6 +28,7 @@ void        variables_hash();
 void        dump_config();
 void        dump_config_as_events();
 
+void        uri_change_cb (WebKitWebView *web_view, GParamSpec param_spec);
 
 void        cmd_load_uri();
 void        cmd_set_status();
-- 
cgit v1.2.3