diff options
Diffstat (limited to 'src/xwidget.c')
| -rw-r--r-- | src/xwidget.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index f436e95d686..d438d879098 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -6,8 +6,8 @@ This file is part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software: you can redistribute it and/or modify | 7 | GNU Emacs is free software: you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation, either version 3 of the License, or | 9 | the Free Software Foundation, either version 3 of the License, or (at |
| 10 | (at your option) any later version. | 10 | your option) any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -387,9 +387,12 @@ webkit_download_cb (WebKitWebView *webkitwebview, | |||
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | static gboolean | 389 | static gboolean |
| 390 | webkit_mime_type_policy_typedecision_requested_cb | 390 | webkit_mime_type_policy_typedecision_requested_cb (WebKitWebView *webView, |
| 391 | (WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request, | 391 | WebKitWebFrame *frame, |
| 392 | gchar *mimetype, WebKitWebPolicyDecision *policy_decision, gpointer user_data) | 392 | WebKitNetworkRequest *request, |
| 393 | gchar *mimetype, | ||
| 394 | WebKitWebPolicyDecision *policy_decision, | ||
| 395 | gpointer user_data) | ||
| 393 | { | 396 | { |
| 394 | /* This function makes webkit send a download signal for all unknown | 397 | /* This function makes webkit send a download signal for all unknown |
| 395 | mime types. TODO: Defer the decision to Lisp, so that it's | 398 | mime types. TODO: Defer the decision to Lisp, so that it's |
| @@ -404,10 +407,12 @@ webkit_mime_type_policy_typedecision_requested_cb | |||
| 404 | } | 407 | } |
| 405 | 408 | ||
| 406 | static gboolean | 409 | static gboolean |
| 407 | webkit_new_window_policy_decision_requested_cb | 410 | webkit_new_window_policy_decision_requested_cb (WebKitWebView *webView, |
| 408 | (WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request, | 411 | WebKitWebFrame *frame, |
| 409 | WebKitWebNavigationAction *navigation_action, | 412 | WebKitNetworkRequest *request, |
| 410 | WebKitWebPolicyDecision *policy_decision, gpointer user_data) | 413 | WebKitWebNavigationAction *navigation_action, |
| 414 | WebKitWebPolicyDecision *policy_decision, | ||
| 415 | gpointer user_data) | ||
| 411 | { | 416 | { |
| 412 | struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET); | 417 | struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET); |
| 413 | webkit_web_navigation_action_get_original_uri (navigation_action); | 418 | webkit_web_navigation_action_get_original_uri (navigation_action); |
| @@ -419,10 +424,12 @@ webkit_new_window_policy_decision_requested_cb | |||
| 419 | } | 424 | } |
| 420 | 425 | ||
| 421 | static gboolean | 426 | static gboolean |
| 422 | webkit_navigation_policy_decision_requested_cb | 427 | webkit_navigation_policy_decision_requested_cb (WebKitWebView *webView, |
| 423 | (WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request, | 428 | WebKitWebFrame *frame, |
| 424 | WebKitWebNavigationAction *navigation_action, | 429 | WebKitNetworkRequest *request, |
| 425 | WebKitWebPolicyDecision *policy_decision, gpointer user_data) | 430 | WebKitWebNavigationAction *navigation_action, |
| 431 | WebKitWebPolicyDecision *policy_decision, | ||
| 432 | gpointer user_data) | ||
| 426 | { | 433 | { |
| 427 | struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET); | 434 | struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET); |
| 428 | store_xwidget_event_string (xw, "navigation-policy-decision-requested", | 435 | store_xwidget_event_string (xw, "navigation-policy-decision-requested", |