Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-18 19:04:02 -05:00
Code Issues Projects Releases Wiki Activity

webkit2: Do not register notify::load-status handler

Browse Source 
This did not seem to do anything with webkit2, so do not bother
registering the handler.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2020-02-16 18:16:13 +02:00
parent 9ea9d18de7
commit ae07bc46ce
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/browser.c
View File

@ -77,17 +77,15 @@ static void view_cb_notify_progress(WebKitWebView *view, GParamSpec *pspec,
#endif /* USE_WEBKIT2 */ #endif /* USE_WEBKIT2 */
#ifndef USE_WEBKIT2
static void view_cb_notify_load_status(WebKitWebView *view, GParamSpec *pspec, static void view_cb_notify_load_status(WebKitWebView *view, GParamSpec *pspec,
struct browser_context *ctx) struct browser_context *ctx)
{ {
#ifdef USE_WEBKIT2
int status = webkit_web_view_get_estimated_load_progress(view);
#else /* USE_WEBKIT2 */
int status = webkit_web_view_get_load_status(view); int status = webkit_web_view_get_load_status(view);
#endif /* USE_WEBKIT2 */
wpa_printf(MSG_DEBUG, "BROWSER:%s load-status=%d uri=%s", wpa_printf(MSG_DEBUG, "BROWSER:%s load-status=%d uri=%s",
__func__, status, webkit_web_view_get_uri(view)); __func__, status, webkit_web_view_get_uri(view));
} }
#endif /* USE_WEBKIT2 */
static void view_cb_resource_request_starting(WebKitWebView *view, static void view_cb_resource_request_starting(WebKitWebView *view,
@ -292,8 +290,6 @@ int hs20_web_browser(const char *url, int ignore_tls)
view = WEBKIT_WEB_VIEW(webkit_web_view_new()); view = WEBKIT_WEB_VIEW(webkit_web_view_new());
ctx.view = view; ctx.view = view;
g_signal_connect(G_OBJECT(view), "notify::load-status",
G_CALLBACK(view_cb_notify_load_status), &ctx);
#ifdef USE_WEBKIT2 #ifdef USE_WEBKIT2
g_signal_connect(G_OBJECT(view), "notify::estimated-load-progress", g_signal_connect(G_OBJECT(view), "notify::estimated-load-progress",
G_CALLBACK(view_cb_notify_estimated_load_progress), G_CALLBACK(view_cb_notify_estimated_load_progress),
@ -311,6 +307,8 @@ int hs20_web_browser(const char *url, int ignore_tls)
G_CALLBACK(view_cb_download_requested), &ctx); G_CALLBACK(view_cb_download_requested), &ctx);
*/ */
#else /* USE_WEBKIT2 */ #else /* USE_WEBKIT2 */
g_signal_connect(G_OBJECT(view), "notify::load-status",
G_CALLBACK(view_cb_notify_load_status), &ctx);
g_signal_connect(G_OBJECT(view), "notify::progress", g_signal_connect(G_OBJECT(view), "notify::progress",
G_CALLBACK(view_cb_notify_progress), &ctx); G_CALLBACK(view_cb_notify_progress), &ctx);
g_signal_connect(G_OBJECT(view), "resource-request-starting", g_signal_connect(G_OBJECT(view), "resource-request-starting",