[epiphany] Rename webextension uri to ephy-webextension
- From: Jan-Michael Brummer <jbrummer src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Rename webextension uri to ephy-webextension
- Date: Wed, 3 Feb 2021 17:27:39 +0000 (UTC)
commit d0d57c0df11e06e82b563f52887ba7d9c27198ee
Author: Jan-Michael Brummer <jan brummer tabos org>
Date: Tue Feb 2 22:22:10 2021 +0100
Rename webextension uri to ephy-webextension
Make it clear that this is an own epiphany internal uri scheme.
embed/ephy-web-view.c | 2 +-
embed/web-process-extension/ephy-webextension-api.c | 2 +-
src/webextension/ephy-web-extension-manager.c | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 814d05989..4bf68f174 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1431,7 +1431,7 @@ update_security_status_for_committed_load (EphyWebView *view,
if (view->loading_error_page)
return;
- if (g_str_has_prefix (uri, "webextension://")) {
+ if (g_str_has_prefix (uri, "ephy-webextension://")) {
/* Hidden WebExtension webview, ignoring */
return;
}
diff --git a/embed/web-process-extension/ephy-webextension-api.c
b/embed/web-process-extension/ephy-webextension-api.c
index bd2f6e9c2..35f5d85fd 100644
--- a/embed/web-process-extension/ephy-webextension-api.c
+++ b/embed/web-process-extension/ephy-webextension-api.c
@@ -74,7 +74,7 @@ static char *
js_geturl (const char *path,
gpointer user_data)
{
- return g_strdup_printf ("webextension:///%s", path);
+ return g_strdup_printf ("ephy-webextension:///%s", path);
}
void
diff --git a/src/webextension/ephy-web-extension-manager.c b/src/webextension/ephy-web-extension-manager.c
index 6d9d5ec89..5187a4e2a 100644
--- a/src/webextension/ephy-web-extension-manager.c
+++ b/src/webextension/ephy-web-extension-manager.c
@@ -635,17 +635,17 @@ create_web_extensions_webview (EphyWebExtension *web_extension,
"epiphany",
ephy_embed_shell_get_guid
(ephy_embed_shell_get_default ()));
web_context = ephy_embed_shell_get_web_context (ephy_embed_shell_get_default ());
- webkit_web_context_register_uri_scheme (web_context, "webextension", web_extension_cb, web_extension,
NULL);
+ webkit_web_context_register_uri_scheme (web_context, "ephy-webextension", web_extension_cb,
web_extension, NULL);
webkit_security_manager_register_uri_scheme_as_secure (webkit_web_context_get_security_manager
(web_context),
- "webextension");
+ "ephy-webextension");
web_view = ephy_web_view_new_with_user_content_manager (ucm);
} else {
webkit_user_content_manager_register_script_message_handler (ucm, "epiphany");
web_context = webkit_web_context_new ();
- webkit_web_context_register_uri_scheme (web_context, "webextension", web_extension_cb, web_extension,
NULL);
+ webkit_web_context_register_uri_scheme (web_context, "ephy-webextension", web_extension_cb,
web_extension, NULL);
g_signal_connect_object (web_context, "initialize-web_extensions", G_CALLBACK (init_web_extension_api),
web_extension, 0);
webkit_security_manager_register_uri_scheme_as_secure (webkit_web_context_get_security_manager
(web_context),
- "webextension");
+ "ephy-webextension");
web_view = g_object_new (EPHY_TYPE_WEB_VIEW,
"web-context", web_context,
"user-content-manager", ucm,
@@ -680,7 +680,7 @@ create_browser_popup (EphyWebExtension *web_extension)
popup = ephy_web_extension_get_browser_popup (web_extension);
dir_name = g_path_get_dirname (popup);
- base_uri = g_strdup_printf ("webextension:///%s/", dir_name);
+ base_uri = g_strdup_printf ("ephy-webextension:///%s/", dir_name);
data = ephy_web_extension_get_resource_as_string (web_extension, popup);
webkit_web_view_load_html (WEBKIT_WEB_VIEW (web_view), (char *)data, base_uri);
gtk_container_add (GTK_CONTAINER (popover), web_view);
@@ -875,14 +875,14 @@ run_background_script (EphyWebExtensionManager *self,
if (page) {
g_autofree char *data = ephy_web_extension_get_resource_as_string (web_extension, page);
- base_uri = g_strdup_printf ("webextension://%s/%s/", ephy_web_extension_get_guid (web_extension),
g_path_get_dirname (page));
+ base_uri = g_strdup_printf ("ephy-webextension://%s/%s/", ephy_web_extension_get_guid (web_extension),
g_path_get_dirname (page));
webkit_web_view_load_html (WEBKIT_WEB_VIEW (background), (char *)data, base_uri);
} else {
GPtrArray *scripts = ephy_web_extension_background_web_view_get_scripts (web_extension);
ucm = webkit_web_view_get_user_content_manager (WEBKIT_WEB_VIEW (background));
- base_uri = g_strdup_printf ("webextension://%s/", ephy_web_extension_get_guid (web_extension));
+ base_uri = g_strdup_printf ("ephy-webextension://%s/", ephy_web_extension_get_guid (web_extension));
for (unsigned int i = 0; i < scripts->len; i++) {
const char *script_file = g_ptr_array_index (scripts, i);
g_autofree char *data = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]