diff options
| author | Logan Rathbone <poprocks@gmail.com> | 2023-01-24 14:21:59 -0500 |
|---|---|---|
| committer | Logan Rathbone <poprocks@gmail.com> | 2023-01-24 14:21:59 -0500 |
| commit | 9a25ce0f68abd73af9024d48cb7e1925303c2183 (patch) | |
| tree | af4509077d3f58f2d2674ae200614f8176be0610 /src | |
| parent | 05921d7f6b0dd519b95f1b868e93bafd081237ca (diff) | |
| download | zenity-9a25ce0f68abd73af9024d48cb7e1925303c2183.tar.gz | |
text: Re-add webkit support for gtk4
Diffstat (limited to 'src')
| -rw-r--r-- | src/meson.build | 2 | ||||
| -rw-r--r-- | src/text.c | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/meson.build b/src/meson.build index 0c03b31..2ee1889 100644 --- a/src/meson.build +++ b/src/meson.build @@ -46,6 +46,6 @@ zenity = executable( zenity_sources + zenity_enums + zenity_res, include_directories: zenity_root_dir, c_args: zenity_c_args, - dependencies: adw_dep, + dependencies: [adw_dep, webkitgtk_dep], install: true ) @@ -41,7 +41,6 @@ static ZenityTextData *zen_text_data; static void zenity_text_dialog_response (GtkWidget *widget, char *rstr, gpointer data); static void zenity_text_toggle_button (GtkCheckButton *button, AdwMessageDialog *dialog); -// TODO - I don't think gtk4 support for webkit is fully "there" yet. #ifdef HAVE_WEBKITGTK static void zenity_configure_webkit (WebKitWebView *web_view) { @@ -77,7 +76,6 @@ zenity_configure_webkit (WebKitWebView *web_view) { NULL); g_object_set (G_OBJECT (settings), "enable-page-cache", FALSE, NULL); g_object_set (G_OBJECT (settings), "enable-plugins", FALSE, NULL); - g_object_set (G_OBJECT (settings), "enable-private-browsing", TRUE, NULL); /* Stick to defaults "enforce-96-dpi" gboolean : Read / Write / @@ -356,10 +354,13 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) if (data->modal) gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); -/* TODO once gtk4 support fully lands in webkitgtk. */ #ifdef HAVE_WEBKITGTK - if (text_data->html) { - web_kit = webkit_web_view_new (); + if (text_data->html) + { + /* "ephemeral" == private browsing */ + g_autoptr(WebKitWebContext) wk_context = webkit_web_context_new_ephemeral (); + + web_kit = webkit_web_view_new_with_context (wk_context); scrolled_window = GTK_WIDGET ( gtk_builder_get_object (builder, "zenity_text_scrolled_window")); @@ -373,9 +374,9 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) webkit_web_view_load_uri ( WEBKIT_WEB_VIEW (web_kit), text_data->url); } else { - g_autoptr char *cwd = NULL; - g_autoptr char *dirname = NULL; - g_autoptr char *dirname_uri = NULL; + g_autofree char *cwd = NULL; + g_autofree char *dirname = NULL; + g_autofree char *dirname_uri = NULL; dirname = text_data->uri ? g_path_get_dirname (text_data->uri) : g_strdup ("/"); cwd = g_get_current_dir (); @@ -396,9 +397,7 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) G_CALLBACK (zenity_text_webview_load_changed), NULL); - gtk_widget_destroy (GTK_WIDGET (text_view)); - gtk_container_add (GTK_CONTAINER (scrolled_window), web_kit); - gtk_widget_show (GTK_WIDGET (web_kit)); + gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW(scrolled_window), web_kit); } #endif /* HAVE_WEBKITGTK */ |