change @uri when the fragment identifier changes

3 files changed, 27 insertions, 23 deletions

diff --git a/src/callbacks.c b/src/callbacks.c
index cb9b492..3a544a1 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -455,29 +455,44 @@ void
 load_status_change_cb (WebKitWebView* web_view, GParamSpec param_spec) {
     (void) param_spec;
 
-    WebKitWebFrame *frame = webkit_web_view_get_main_frame(web_view);
     WebKitLoadStatus status = webkit_web_view_get_load_status(web_view);
     switch(status) {
         case WEBKIT_LOAD_PROVISIONAL:
-            send_event(LOAD_START, NULL, TYPE_STR, uzbl.state.uri ? uzbl.state.uri : "", NULL);
+            send_event(LOAD_START,  NULL, TYPE_STR, uzbl.state.uri ? uzbl.state.uri : "", NULL);
             break;
         case WEBKIT_LOAD_COMMITTED:
-            g_free (uzbl.state.uri);
-            GString* newuri = g_string_new (webkit_web_frame_get_uri (frame));
-            uzbl.state.uri = g_string_free (newuri, FALSE);
-            g_setenv("UZBL_URI", uzbl.state.uri, TRUE);
-
+            frame = webkit_web_view_get_main_frame(web_view);
             send_event(LOAD_COMMIT, NULL, TYPE_STR, webkit_web_frame_get_uri (frame), NULL);
             break;
         case WEBKIT_LOAD_FINISHED:
-            send_event(LOAD_FINISH, NULL, TYPE_STR, webkit_web_frame_get_uri(frame), NULL);
+            send_event(LOAD_FINISH, NULL, TYPE_STR, uzbl.state.uri, NULL);
             break;
         case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
             break; /* we don't do anything with this (yet) */
         case WEBKIT_LOAD_FAILED:
             break; /* load_error_cb will handle this case */
     }
+}
+
+void
+load_error_cb (WebKitWebView* page, WebKitWebFrame* frame, gchar *uri, gpointer web_err, gpointer ud) {
+    (void) page; (void) frame; (void) ud;
+    GError *err = web_err;
+
+    send_event (LOAD_ERROR, NULL,
+        TYPE_STR, uri,
+        TYPE_INT, err->code,
+        TYPE_STR, err->message,
+        NULL);
+}
+
+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
@@ -492,20 +507,6 @@ selection_changed_cb(WebKitWebView *webkitwebview, gpointer ud) {
 }
 
 void
-load_error_cb (WebKitWebView* page, WebKitWebFrame* frame, gchar *uri, gpointer web_err, gpointer ud) {
-    (void) page;
-    (void) frame;
-    (void) ud;
-    GError *err = web_err;
-
-    send_event (LOAD_ERROR, NULL,
-        TYPE_STR, uri,
-        TYPE_INT, err->code,
-        TYPE_STR, err->message,
-        NULL);
-}
-
-void
 destroy_cb (GtkWidget* widget, gpointer data) {
     (void) widget;
     (void) data;
diff --git a/src/callbacks.h b/src/callbacks.h
index ab0c1df..d34b9fa 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -161,6 +161,9 @@ void
 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/uzbl-core.c b/src/uzbl-core.c
index 31ed50d..d73fbdf 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -1394,7 +1394,6 @@ update_title(void) {
     }
 }
 
-
 void
 create_scrolled_win() {
     GUI* g = &uzbl.gui;
@@ -1423,6 +1422,7 @@ create_scrolled_win() {
       "signal::selection-changed",                    (GCallback)selection_changed_cb,    NULL,
       "signal::notify::progress",                     (GCallback)progress_change_cb,      NULL,
       "signal::notify::load-status",                  (GCallback)load_status_change_cb,   NULL,
+      "signal::notify::uri",                          (GCallback)uri_change_cb,           NULL,
       "signal::load-error",                           (GCallback)load_error_cb,           NULL,
       "signal::hovering-over-link",                   (GCallback)link_hover_cb,           NULL,
       "signal::navigation-policy-decision-requested", (GCallback)navigation_decision_cb,  NULL,