Fix X11 webview with recent glib

Signed-off-by: falkTX <[email protected]>

Author: falkTX

distrho/extra/WebViewImpl.cpp

@@ -948,7 +948,7 @@ struct QSize {
     S NAME = reinterpret_cast<S>(dlsym(nullptr, #SN)); \
     DISTRHO_SAFE_ASSERT_RETURN(NAME != nullptr, false);
 
-static void web_wake_idle(void* const ptr)
+static gboolean web_wake_idle(void* const ptr)
 {
     WebViewRingBuffer* const shmptr = static_cast<WebViewRingBuffer*>(ptr);
 
@@ -996,6 +996,7 @@ static void web_wake_idle(void* const ptr)
     }
 
     free(buffer);
+    return false;
 }
 
 // -----------------------------------------------------------------------------------------------------------
@@ -1054,7 +1055,7 @@ static bool gtk3(Display* const display,
         return false;
     }
 
-    typedef void (*g_main_context_invoke_t)(void*, void*, void*);
+    typedef void (*g_idle_add_t)(void*, void*);
     typedef ulong (*g_signal_connect_data_t)(void*, const char*, void*, void*, void*, int);
     typedef void (*gdk_set_allowed_backends_t)(const char*);
     typedef void (*gtk_container_add_t)(GtkContainer*, GtkWidget*);
@@ -1081,7 +1082,7 @@ static bool gtk3(Display* const display,
     typedef void* (*webkit_web_view_run_javascript_t)(WebKitWebView*, const char*, void*, void*, void*);
     typedef void (*webkit_web_view_set_background_color_t)(WebKitWebView*, const double*);
 
-    CSYM(g_main_context_invoke_t, g_main_context_invoke)
+    CSYM(g_idle_add_t, g_idle_add)
     CSYM(g_signal_connect_data_t, g_signal_connect_data)
     CSYM(gdk_set_allowed_backends_t, gdk_set_allowed_backends)
     CSYM(gtk_container_add_t, gtk_container_add)
@@ -1200,7 +1201,7 @@ static bool gtk3(Display* const display,
         const webkit_web_view_run_javascript_t _webkit_web_view_run_javascript;
         const webkit_web_view_load_uri_t _webkit_web_view_load_uri;
         const gtk_main_quit_t _gtk_main_quit;
-        const g_main_context_invoke_t _g_main_context_invoke;
+        const g_idle_add_t _g_idle_add;
 
         Gtk3WebFramework(const char* const url,
                          WebViewRingBuffer* const shmptr,
@@ -1209,15 +1210,15 @@ static bool gtk3(Display* const display,
                          const webkit_web_view_run_javascript_t webkit_web_view_run_javascript,
                          const webkit_web_view_load_uri_t webkit_web_view_load_uri,
                          const gtk_main_quit_t gtk_main_quit,
-                         const g_main_context_invoke_t g_main_context_invoke)
+                         const g_idle_add_t g_idle_add)
             : _url(url),
               _shmptr(shmptr),
               _webview(webview),
               _webkit_web_view_evaluate_javascript(webkit_web_view_evaluate_javascript),
               _webkit_web_view_run_javascript(webkit_web_view_run_javascript),
               _webkit_web_view_load_uri(webkit_web_view_load_uri),
               _gtk_main_quit(gtk_main_quit),
-              _g_main_context_invoke(g_main_context_invoke) {}
+              _g_idle_add(g_idle_add) {}
 
         void evaluate(const char* const js) override
         {
@@ -1245,7 +1246,7 @@ static bool gtk3(Display* const display,
 
         void wake(WebViewRingBuffer* const rb) override
         {
-            _g_main_context_invoke(NULL, G_CALLBACK(web_wake_idle), rb);
+            _g_idle_add(G_CALLBACK(web_wake_idle), rb);
         }
     };
 
@@ -1256,7 +1257,7 @@ static bool gtk3(Display* const display,
                                      webkit_web_view_run_javascript,
                                      webkit_web_view_load_uri,
                                      gtk_main_quit,
-                                     g_main_context_invoke);
+                                     g_idle_add);
 
     webFramework = &webFrameworkObj;