Permalink
Browse files

Merge branch 'master' into experimental

  • Loading branch information...
2 parents 47fd576 + 808561b commit 08065a77c959827d3e6baba2b4c74b4f40610cd8 @bct bct committed Apr 22, 2012
Showing with 0 additions and 15 deletions.
  1. +0 −11 src/callbacks.c
  2. +0 −3 src/callbacks.h
  3. +0 −1 src/uzbl-core.c
View
@@ -94,17 +94,6 @@ load_error_cb (WebKitWebView* page, WebKitWebFrame* frame, gchar *uri, gpointer
return FALSE;
}
-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;
View
@@ -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
-selection_changed_cb(WebKitWebView *webkitwebview, gpointer ud);
-
void
destroy_cb (GtkWidget* widget, gpointer data);
View
@@ -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,

0 comments on commit 08065a7

Please sign in to comment.