From 6dbcd09121fe266c7704a524b5cbd7f2754659c0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Sep 2012 14:01:09 +0200 Subject: Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119) New snapshot with prospective build fix for incorrect QtWebKit master module header file creation --- Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp') diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp index e35f603ff..1e6aa7fac 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp @@ -248,12 +248,19 @@ static void zoomTextOnlyChanged(WebKitSettings* settings, GParamSpec*, WebKitWeb WKPageSetPageAndTextZoomFactors(wkPage, pageZoomLevel, textZoomLevel); } +static void userAgentChanged(WebKitSettings* settings, GParamSpec*, WebKitWebView* webView) +{ + WKRetainPtr userAgent = adoptWK(WKStringCreateWithUTF8CString(webkit_settings_get_user_agent(settings))); + WKPageSetCustomUserAgent(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), userAgent.get()); +} + static void webkitWebViewSetSettings(WebKitWebView* webView, WebKitSettings* settings, WKPageRef wkPage) { webView->priv->settings = settings; webkitSettingsAttachSettingsToPage(webView->priv->settings.get(), wkPage); g_signal_connect(settings, "notify::allow-modal-dialogs", G_CALLBACK(allowModalDialogsChanged), webView); g_signal_connect(settings, "notify::zoom-text-only", G_CALLBACK(zoomTextOnlyChanged), webView); + g_signal_connect(settings, "notify::user-agent", G_CALLBACK(userAgentChanged), webView); } static void webkitWebViewDisconnectSettingsSignalHandlers(WebKitWebView* webView) @@ -261,7 +268,7 @@ static void webkitWebViewDisconnectSettingsSignalHandlers(WebKitWebView* webView WebKitSettings* settings = webView->priv->settings.get(); g_signal_handlers_disconnect_by_func(settings, reinterpret_cast(allowModalDialogsChanged), webView); g_signal_handlers_disconnect_by_func(settings, reinterpret_cast(zoomTextOnlyChanged), webView); - + g_signal_handlers_disconnect_by_func(settings, reinterpret_cast(userAgentChanged), webView); } static void webkitWebViewDisconnectMainResourceResponseChangedSignalHandler(WebKitWebView* webView) -- cgit v1.2.1