wpe: Use proper callback for TLS errors signal handling
authorPhilippe Normand <philn@igalia.com>
Thu, 10 Sep 2020 12:05:23 +0000 (13:05 +0100)
committerPhilippe Normand <philn@igalia.com>
Mon, 21 Sep 2020 14:11:15 +0000 (14:11 +0000)
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>

ext/wpe/WPEThreadedView.cpp

index 4c8047bcb465f1b12aa5822e2477671d1c8f4751..bf888350f3f707690e22eaceb2222eafab3a9da9 100644 (file)
@@ -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);