[epiphany/wip/security-origins: 8/8] Rename EPHY_PERMISSION_ALLOW to EPHY_PERMISSION_PERMIT
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/security-origins: 8/8] Rename EPHY_PERMISSION_ALLOW to EPHY_PERMISSION_PERMIT
- Date: Fri, 30 Dec 2016 17:19:26 +0000 (UTC)
commit f03156aa2f3379e8ecc1deda0d598f1f9e393677
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Thu Dec 29 20:11:17 2016 -0600
Rename EPHY_PERMISSION_ALLOW to EPHY_PERMISSION_PERMIT
For better parallelism with EPHY_PERMISSION_DENY
embed/ephy-web-view.c | 4 ++--
embed/web-extension/ephy-web-extension.c | 4 ++--
lib/ephy-permissions-manager.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index f379d31..0a5e24d 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1320,7 +1320,7 @@ decide_on_permission_request (GtkWidget *info_bar,
ephy_permissions_manager_set_permission (permissions_manager,
permission_type,
data->origin,
- response == GTK_RESPONSE_YES ? EPHY_PERMISSION_ALLOW
+ response == GTK_RESPONSE_YES ? EPHY_PERMISSION_PERMIT
: EPHY_PERMISSION_DENY);
}
@@ -1468,7 +1468,7 @@ permission_request_cb (WebKitWebView *web_view,
g_free (origin);
switch (permission) {
- case EPHY_PERMISSION_ALLOW:
+ case EPHY_PERMISSION_PERMIT:
webkit_permission_request_allow (decision);
return TRUE;
case EPHY_PERMISSION_DENY:
diff --git a/embed/web-extension/ephy-web-extension.c b/embed/web-extension/ephy-web-extension.c
index ea6d3c2..13c32a6 100644
--- a/embed/web-extension/ephy-web-extension.c
+++ b/embed/web-extension/ephy-web-extension.c
@@ -413,7 +413,7 @@ should_store_cb (const char *username,
if (g_strcmp0 (username, username_field_value) == 0 &&
g_str_equal (password, password_field_value)) {
LOG ("User/password already stored. Not asking about storing.");
- } else if (permission == EPHY_PERMISSION_ALLOW) {
+ } else if (permission == EPHY_PERMISSION_PERMIT) {
LOG ("User/password not yet stored. Storing.");
store_password (form_auth);
} else {
@@ -423,7 +423,7 @@ should_store_cb (const char *username,
g_free (username_field_value);
g_free (password_field_value);
- } else if (permission == EPHY_PERMISSION_ALLOW) {
+ } else if (permission == EPHY_PERMISSION_PERMIT) {
LOG ("No result on query; storing.");
store_password (form_auth);
} else {
diff --git a/lib/ephy-permissions-manager.h b/lib/ephy-permissions-manager.h
index fbad3a0..1090a99 100644
--- a/lib/ephy-permissions-manager.h
+++ b/lib/ephy-permissions-manager.h
@@ -32,7 +32,7 @@ G_DECLARE_FINAL_TYPE (EphyPermissionsManager, ephy_permissions_manager, EPHY, PE
typedef enum {
EPHY_PERMISSION_UNDECIDED = -1,
EPHY_PERMISSION_DENY = 0,
- EPHY_PERMISSION_ALLOW = 1,
+ EPHY_PERMISSION_PERMIT = 1
} EphyPermission;
typedef enum {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]