diff options
| -rwxr-xr-x | examples/data/scripts/follow.sh | 4 | ||||
| -rwxr-xr-x | examples/data/scripts/load_cookies.sh | 2 | ||||
| -rw-r--r-- | src/callbacks.c | 11 | ||||
| -rw-r--r-- | src/callbacks.h | 3 | ||||
| -rw-r--r-- | src/uzbl-core.c | 1 |
5 files changed, 4 insertions, 17 deletions
diff --git a/examples/data/scripts/follow.sh b/examples/data/scripts/follow.sh index de126eb..ca6b7a0 100755 --- a/examples/data/scripts/follow.sh +++ b/examples/data/scripts/follow.sh @@ -14,7 +14,9 @@ case "$result" in printf 'set mode=\nevent KEYCMD_CLEAR\n' > "$UZBL_FIFO" ;; XXXNEW_WINDOWXXX*) - printf "set mode=\nevent KEYCMD_CLEAR\nevent NEW_WINDOW $@\n" > "$UZBL_FIFO" + echo "set mode= +event KEYCMD_CLEAR +event NEW_WINDOW $@" > "$UZBL_FIFO" ;; XXXRETURNED_URIXXX*) uriaction=$1 diff --git a/examples/data/scripts/load_cookies.sh b/examples/data/scripts/load_cookies.sh index 380301e..5feca05 100755 --- a/examples/data/scripts/load_cookies.sh +++ b/examples/data/scripts/load_cookies.sh @@ -14,7 +14,7 @@ BEGIN { } $0 ~ /^#HttpOnly_/ { gsub(/@/, "\\@") - printf("add_cookie \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n", substr($1,length("#HttpOnly_"),length($1)), $3, $6, $7, scheme[$4], $5) + printf("add_cookie \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n", substr($1,length("#HttpOnly_")+1,length($1)), $3, $6, $7, scheme[$4], $5) } $0 !~ /^#/ { gsub(/@/, "\\@") diff --git a/src/callbacks.c b/src/callbacks.c index 5b66905..eee9f69 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -95,17 +95,6 @@ load_error_cb (WebKitWebView* page, WebKitWebFrame* frame, gchar *uri, gpointer } void -selection_changed_cb(WebKitWebView *webkitwebview, gpointer ud) { - (void)ud; - gchar *tmp; - - webkit_web_view_copy_clipboard(webkitwebview); - tmp = gtk_clipboard_wait_for_text(gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)); - send_event(SELECTION_CHANGED, NULL, TYPE_STR, tmp ? tmp : "", NULL); - g_free(tmp); -} - -void destroy_cb (GtkWidget* widget, gpointer data) { (void) widget; (void) data; diff --git a/src/callbacks.h b/src/callbacks.h index e9240b5..6a10205 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 -selection_changed_cb(WebKitWebView *webkitwebview, gpointer ud); - -void destroy_cb (GtkWidget* widget, gpointer data); gboolean diff --git a/src/uzbl-core.c b/src/uzbl-core.c index 770d832..9db034a 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -771,7 +771,6 @@ create_scrolled_win() { "signal::button-release-event", (GCallback)button_release_cb, NULL, "signal::motion-notify-event", (GCallback)motion_notify_cb, NULL, "signal::notify::title", (GCallback)title_change_cb, NULL, - "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, |