From 62f2c31cefbd94e993584736fc82e33d4c62060b Mon Sep 17 00:00:00 2001 From: Diego Escalante Urrelo Date: Wed, 8 Dec 2010 15:35:56 +0100 Subject: ephy-permission-manager: fix names of permission types Prefix them with EPHY_PERMISSION_TYPE instead of "EPT_". Bug #636790 --- embed/ephy-permission-manager.h | 6 +++--- embed/ephy-web-view.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/embed/ephy-permission-manager.h b/embed/ephy-permission-manager.h index f34ae7c6c..e09e82dfe 100644 --- a/embed/ephy-permission-manager.h +++ b/embed/ephy-permission-manager.h @@ -39,9 +39,9 @@ G_BEGIN_DECLS #define EPHY_TYPE_PERMISSION_INFO (ephy_permission_info_get_type ()) -#define EPT_COOKIE "cookie" -#define EPT_IMAGE "image" -#define EPT_POPUP "popup" +#define EPHY_PERMISSION_TYPE_COOKIE "cookie" +#define EPHY_PERMISSION_TYPE_IMAGE "image" +#define EPHY_PERMISSION_TYPE_POPUP "popup" typedef enum { diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c index 6a0c52f87..9a46a228c 100644 --- a/embed/ephy-web-view.c +++ b/embed/ephy-web-view.c @@ -306,7 +306,9 @@ ephy_web_view_set_popups_allowed (EphyWebView *view, permission = allowed ? EPHY_PERMISSION_ALLOWED : EPHY_PERMISSION_DENIED; - ephy_permission_manager_add_permission (manager, location, EPT_POPUP, permission); + ephy_permission_manager_add_permission (manager, location, + EPHY_PERMISSION_TYPE_POPUP, + permission); if (allowed) { popups_manager_show_all (view); @@ -334,7 +336,7 @@ ephy_web_view_get_popups_allowed (EphyWebView *view) if (location == NULL) return FALSE;/* FALSE, TRUE… same thing */ response = ephy_permission_manager_test_permission - (permission_manager, location, EPT_POPUP); + (permission_manager, location, EPHY_PERMISSION_TYPE_POPUP); switch (response) { case EPHY_PERMISSION_ALLOWED: -- cgit