Use the newer and recommended callback for handling navigation requests in WebKitGTK+.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index d1aed673fa3ed3b9e938a9db825bc182b2084e04..6e6096bf378061f2d79587854b01a2dc7f20b58c 100644 (file)
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -60,11 +60,13 @@ wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec*,
     }
 }
 
     }
 }
 

-static WebKitNavigationResponse
-wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView*,
-                                          WebKitWebFrame       *frame,
-                                          WebKitNetworkRequest *request,
-                                          wxWebViewWebKit      *webKitCtrl)
+static gboolean
+wxgtk_webview_webkit_navigation(WebKitWebView*,
+                                WebKitWebFrame *frame,
+                                WebKitNetworkRequest *request,
+                                WebKitWebNavigationAction*,
+                                WebKitWebPolicyDecision *policy_decision,
+                                wxWebViewWebKit *webKitCtrl)

 {
     webKitCtrl->m_busy = true;
 
 {
     webKitCtrl->m_busy = true;
 


@@ -83,11 +85,12 @@ wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView*,
     if (thisEvent.IsVetoed())
     {
         webKitCtrl->m_busy = false;
     if (thisEvent.IsVetoed())
     {
         webKitCtrl->m_busy = false;

-        return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
+        webkit_web_policy_decision_ignore(policy_decision);
+        return TRUE;

     }
     else
     {
     }
     else
     {

-        return  WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
+        return FALSE;

     }
 }
 
     }
 }
 


@@ -306,8 +309,8 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
     g_signal_connect_after(web_view, "notify::load-status",
                            G_CALLBACK(wxgtk_webkitctrl_load_status_callback),
                            this);
     g_signal_connect_after(web_view, "notify::load-status",
                            G_CALLBACK(wxgtk_webkitctrl_load_status_callback),
                            this);

-    g_signal_connect_after(web_view, "navigation-requested",
-                           G_CALLBACK(wxgtk_webkitctrl_navigation_requ_callback),
+    g_signal_connect_after(web_view, "navigation-policy-decision-requested",
+                           G_CALLBACK(wxgtk_webview_webkit_navigation),

                            this);
     g_signal_connect_after(web_view, "load-error", 
                            G_CALLBACK(wxgtk_webkitctrl_error),
                            this);
     g_signal_connect_after(web_view, "load-error", 
                            G_CALLBACK(wxgtk_webkitctrl_error),