From 97032cd83cd447cb63c1a498eeb9def9fa2010f4 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Tue, 12 Mar 2024 13:53:45 -0300 Subject: [PATCH] webkitgtk update: replace run_javascript function --- rose | Bin 39128 -> 43176 bytes rose.c | 13 +++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/rose b/rose index 0c0fe8ae06e920c33b15c23c50b53cba1446efc5..fa55a9a695fb146bf191ecb608477cbc7c7d837b 100755 GIT binary patch delta 8340 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 KM;1>s_4^N9IAtaP delta 8375 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 diff --git a/rose.c b/rose.c index f975c97..cdffd5d 100644 --- a/rose.c +++ b/rose.c @@ -69,8 +69,7 @@ void set_custom_style(WebKitWebView* view) if (CUSTOM_STYLE_ENABLED) { char* style_js = malloc(STYLE_N + 1); read_style_js(style_js); - webkit_web_view_run_javascript(view, style_js, - NULL, NULL, NULL); + webkit_web_view_evaluate_javascript(view, style_js, -1, NULL, "rosenrot-style-plugin", NULL, NULL, NULL); free(style_js); } } @@ -130,8 +129,7 @@ GtkWidget* handle_signal_create_new_tab(WebKitWebView* self, gtk_notebook_set_show_tabs(notebook, true); return NULL; } else { - webkit_web_view_run_javascript(self, - "alert('Too many tabs, not opening a new one')", NULL, NULL, NULL); + webkit_web_view_evaluate_javascript(self, "alert('Too many tabs, not opening a new one')", -1, NULL, "rosenrot-alert-numtabs", NULL, NULL, NULL); return NULL; } /* @@ -210,8 +208,8 @@ void notebook_create_new_tab(GtkNotebook* notebook, const char* uri) webkit_web_view_set_zoom_level(view, ZOOM); num_tabs += 1; } else { - webkit_web_view_run_javascript(notebook_get_webview(notebook), - "alert('Too many tabs, not opening a new one')", NULL, NULL, NULL); + + webkit_web_view_evaluate_javascript(notebook_get_webview(notebook), "alert('Too many tabs, not opening a new one')", -1, NULL, "rosenrot-alert-numtabs", NULL, NULL, NULL); } } @@ -372,8 +370,7 @@ int handle_shortcut(func id, GtkNotebook* notebook) if (READABILITY_ENABLED) { char* readability_js = malloc(READABILITY_N + 1); read_readability_js(readability_js); - webkit_web_view_run_javascript(view, - readability_js, NULL, NULL, NULL); + webkit_web_view_evaluate_javascript(view, readability_js, -1, NULL, "rosenrot-readability-plugin", NULL, NULL, NULL); free(readability_js); } break;