summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@redhat.com>2023-05-01 16:22:36 -0500
committerMarge Bot <marge-bot@gnome.org>2023-05-07 22:22:46 +0000
commitd9f68b96159ae72ac94248df689eca7b9977a302 (patch)
treec4007786fc43f262ac17afdc7bd7cd3244e916ba
parent6a3699b463e2d98afd0cc061bc5eeb181367c8da (diff)
downloadepiphany-d9f68b96159ae72ac94248df689eca7b9977a302.tar.gz
Rename website data access permission type
Let's be more accurate as to what is really being requested. Note the permission popover will still say "cookies" for now because changing that would be a string freeze break, but I will follow up on that. Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1327>
-rw-r--r--embed/ephy-web-view.c2
-rw-r--r--lib/ephy-permissions-manager.c2
-rw-r--r--lib/ephy-permissions-manager.h2
-rw-r--r--src/ephy-permission-popover.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 6fed7014d..717e31d14 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -947,7 +947,7 @@ permission_request_cb (WebKitWebView *web_view,
} else if (WEBKIT_IS_CLIPBOARD_PERMISSION_REQUEST (decision)) {
permission_type = EPHY_PERMISSION_TYPE_CLIPBOARD;
} else if (WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST (decision)) {
- permission_type = EPHY_PERMISSION_TYPE_COOKIES;
+ permission_type = EPHY_PERMISSION_TYPE_WEBSITE_DATA_ACCESS;
} else if (WEBKIT_IS_USER_MEDIA_PERMISSION_REQUEST (decision)) {
gboolean is_for_audio_device = webkit_user_media_permission_is_for_audio_device (WEBKIT_USER_MEDIA_PERMISSION_REQUEST (decision));
gboolean is_for_video_device = webkit_user_media_permission_is_for_video_device (WEBKIT_USER_MEDIA_PERMISSION_REQUEST (decision));
diff --git a/lib/ephy-permissions-manager.c b/lib/ephy-permissions-manager.c
index e5af1e779..a9cd69a44 100644
--- a/lib/ephy-permissions-manager.c
+++ b/lib/ephy-permissions-manager.c
@@ -187,7 +187,7 @@ ephy_permission_is_stored_by_permissions_manager (EphyPermissionType type)
switch (type) {
case EPHY_PERMISSION_TYPE_ACCESS_WEBCAM_AND_MICROPHONE:
/* fallthrough */
- case EPHY_PERMISSION_TYPE_COOKIES:
+ case EPHY_PERMISSION_TYPE_WEBSITE_DATA_ACCESS:
/* fallthrough */
case EPHY_PERMISSION_TYPE_CLIPBOARD:
return FALSE;
diff --git a/lib/ephy-permissions-manager.h b/lib/ephy-permissions-manager.h
index 478a899e2..233c416f9 100644
--- a/lib/ephy-permissions-manager.h
+++ b/lib/ephy-permissions-manager.h
@@ -45,7 +45,7 @@ typedef enum {
EPHY_PERMISSION_TYPE_SHOW_ADS,
EPHY_PERMISSION_TYPE_AUTOPLAY_POLICY,
EPHY_PERMISSION_TYPE_ACCESS_WEBCAM_AND_MICROPHONE,
- EPHY_PERMISSION_TYPE_COOKIES,
+ EPHY_PERMISSION_TYPE_WEBSITE_DATA_ACCESS,
EPHY_PERMISSION_TYPE_CLIPBOARD
} EphyPermissionType;
diff --git a/src/ephy-permission-popover.c b/src/ephy-permission-popover.c
index 6068f2439..8a7ad9e81 100644
--- a/src/ephy-permission-popover.c
+++ b/src/ephy-permission-popover.c
@@ -301,7 +301,7 @@ ephy_permission_popover_get_text (EphyPermissionPopover *self,
*message = g_strdup_printf (_("The page at ā€œ%sā€ would like to use your webcam and microphone"),
bold_origin);
break;
- case EPHY_PERMISSION_TYPE_COOKIES:
+ case EPHY_PERMISSION_TYPE_WEBSITE_DATA_ACCESS:
requesting_domain = webkit_website_data_access_permission_request_get_requesting_domain (WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST (self->permission_request));
current_domain = webkit_website_data_access_permission_request_get_current_domain (WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST (self->permission_request));
/* Translators: Storage access policy for a specific site. */