diff options
author | Brendan Taylor <whateley@gmail.com> | 2010-12-03 15:14:42 -0700 |
---|---|---|
committer | Brendan Taylor <whateley@gmail.com> | 2010-12-03 15:14:42 -0700 |
commit | de79ee76d7c86d032309d73ba210668466785b42 (patch) | |
tree | cf596cff5b87f6b67155318188e5f9508239540c /src/callbacks.h | |
parent | eccb7ec98fa198d076be72cd017926354d67cc70 (diff) | |
parent | 5ab073d90e3c66a53e116c78299c657a13847d5c (diff) |
Merge branch 'dev/in-webkit-downloads' into experimental
Conflicts:
examples/data/scripts/download.sh
Diffstat (limited to 'src/callbacks.h')
-rw-r--r-- | src/callbacks.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/callbacks.h b/src/callbacks.h index a4258f2..40fa80d 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -133,9 +133,6 @@ cmd_load_start(); WebKitWebSettings* view_settings(); -gboolean -download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data); - void toggle_zoom_type (WebKitWebView* page, GArray *argv, GString *result); @@ -197,7 +194,7 @@ request_starting_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitWebRes create_web_view_cb (WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data); gboolean -download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data); +download_cb (WebKitWebView *web_view, WebKitDownload *download, gpointer user_data); void populate_popup_cb(WebKitWebView *v, GtkMenu *m, void *c); |