diff options
| author |  David Keijser <keijser@gmail.com> | 2011-05-30 07:01:30 +0200 |
|---|---|---|
| committer | David Keijser <keijser@gmail.com> | 2011-05-30 07:18:20 +0200 |
| commit | 952ceba2183d781245236834dbabf4365b549b95 (patch) | |
| tree | c7eeb00ea856a0e880a04e0394353c01b5ba0fee /src | |
| parent | 50cf5cb0605d51ee928fb4913bdcfb59d89a64f4 (diff) | |
move uri_change_cb to variables
Diffstat (limited to 'src')
| -rw-r--r-- | src/callbacks.c | 9 | ||||
| -rw-r--r-- | src/callbacks.h | 3 | ||||
| -rw-r--r-- | src/variables.c | 9 | ||||
| -rw-r--r-- | src/variables.h | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/src/callbacks.c b/src/callbacks.c index 5bdcb55..ef2005d 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -94,15 +94,6 @@ load_error_cb (WebKitWebView* page, WebKitWebFrame* frame, gchar *uri, gpointer } 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; gchar *tmp; diff --git a/src/callbacks.h b/src/callbacks.h index 7af4332..176cb40 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -19,9 +19,6 @@ 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); void diff --git a/src/variables.c b/src/variables.c index 3488aa4..d1552f9 100644 --- a/src/variables.c +++ b/src/variables.c @@ -247,6 +247,15 @@ view_settings() { } 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(); |