summaryrefslogtreecommitdiff
path: root/ext/wpe/WPEThreadedView.cpp
diff options
context:
space:
mode:
authorPhilippe Normand <philn@igalia.com>2020-09-10 13:05:23 +0100
committerPhilippe Normand <philn@igalia.com>2020-09-21 14:11:15 +0000
commitb707454a5aba1bf7399c6c03502d51d70dc63a73 (patch)
tree60fb0192e1dd929eafb711509cc8138eebea650d /ext/wpe/WPEThreadedView.cpp
parent9e9e5c72d54b69cb3def2753066195e01ca5cad1 (diff)
downloadgstreamer-plugins-bad-b707454a5aba1bf7399c6c03502d51d70dc63a73.tar.gz
wpe: Use proper callback for TLS errors signal handling
The load-failed and load-failed-with-tls-errors signals expect distinct callback signatures. Fixes #1388 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1566>
Diffstat (limited to 'ext/wpe/WPEThreadedView.cpp')
-rw-r--r--ext/wpe/WPEThreadedView.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/wpe/WPEThreadedView.cpp b/ext/wpe/WPEThreadedView.cpp
index 4c8047bcb..bf888350f 100644
--- a/ext/wpe/WPEThreadedView.cpp
+++ b/ext/wpe/WPEThreadedView.cpp
@@ -215,6 +215,12 @@ static gboolean s_loadFailed(WebKitWebView*, WebKitLoadEvent, gchar* failing_uri
return FALSE;
}
+static gboolean s_loadFailedWithTLSErrors(WebKitWebView*, gchar* failing_uri, GTlsCertificate*, GTlsCertificateFlags, gpointer data)
+{
+ // Defer to load-failed.
+ return FALSE;
+}
+
WPEView::WPEView(WebKitWebContext* web_context, GstWpeSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height)
{
g_mutex_init(&images_mutex);
@@ -262,7 +268,7 @@ WPEView::WPEView(WebKitWebContext* web_context, GstWpeSrc* src, GstGLContext* co
webkit.view = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW, "web-context", web_context, "backend", viewBackend, nullptr));
g_signal_connect(webkit.view, "load-failed", G_CALLBACK(s_loadFailed), src);
- g_signal_connect(webkit.view, "load-failed-with-tls-errors", G_CALLBACK(s_loadFailed), src);
+ g_signal_connect(webkit.view, "load-failed-with-tls-errors", G_CALLBACK(s_loadFailedWithTLSErrors), src);
gst_wpe_src_configure_web_view(src, webkit.view);