aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--embed/ephy-cookie-manager.c2
-rw-r--r--embed/ephy-cookie-manager.h23
-rw-r--r--embed/mozilla/EphySingle.cpp8
4 files changed, 9 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b6c66d72..92cbe440d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-15 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/ephy-cookie-manager.c: (ephy_cookie_copy):
+ * embed/ephy-cookie-manager.h:
+ * embed/mozilla/EphySingle.cpp:
+
+ Remove p3p info from EphyCookie.
+
2005-01-14 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-zoom-control.c: (ephy_zoom_control_init):
diff --git a/embed/ephy-cookie-manager.c b/embed/ephy-cookie-manager.c
index 94e0a3071..6d94b1a8f 100644
--- a/embed/ephy-cookie-manager.c
+++ b/embed/ephy-cookie-manager.c
@@ -68,8 +68,6 @@ ephy_cookie_copy (const EphyCookie *cookie)
copy->real_expires = cookie->real_expires;
copy->is_secure = cookie->is_secure;
copy->is_session = cookie->is_session;
- copy->p3p_state = cookie->p3p_state;
- copy->p3p_policy = cookie->p3p_policy;
return copy;
}
diff --git a/embed/ephy-cookie-manager.h b/embed/ephy-cookie-manager.h
index 43e2282af..3b4bf84f1 100644
--- a/embed/ephy-cookie-manager.h
+++ b/embed/ephy-cookie-manager.h
@@ -1,4 +1,4 @@
-/*
+ /*
* Copyright (C) 2003 Marco Pesenti Gritti
* Copyright (C) 2003 Christian Persch
*
@@ -39,25 +39,6 @@ G_BEGIN_DECLS
typedef struct _EphyCookieManager EphyCookieManager;
typedef struct _EphyCookieManagerIface EphyCookieManagerIface;
-typedef enum
-{
- EPHY_COOKIE_P3P_STATE_UNKNOWN,
- EPHY_COOKIE_P3P_STATE_ACCEPTED,
- EPHY_COOKIE_P3P_STATE_DOWNGRADED,
- EPHY_COOKIE_P3P_STATE_FLAGGED,
- EPHY_COOKIE_P3P_STATE_REJECTED
-} EphyCookieP3PState;
-
-typedef enum
-{
- EPHY_COOKIE_P3P_POLICY_UNKNOWN,
- EPHY_COOKIE_P3P_POLICY_NONE,
- EPHY_COOKIE_P3P_POLICY_NO_CONSENT,
- EPHY_COOKIE_P3P_POLICY_IMPLICIT_CONSENT,
- EPHY_COOKIE_P3P_POLICY_EXPLICIT_CONSENT,
- EPHY_COOKIE_P3P_POLICY_NO_II,
-} EphyCookieP3PPolicy;
-
typedef struct
{
char *name;
@@ -66,8 +47,6 @@ typedef struct
char *path;
gulong expires;
glong real_expires;
- EphyCookieP3PState p3p_state;
- EphyCookieP3PPolicy p3p_policy;
guint is_secure : 1;
guint is_session : 1;
} EphyCookie;
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 6e27194d5..5a1f558a4 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -276,14 +276,6 @@ mozilla_cookie_to_ephy_cookie (nsICookie *cookie)
cookie->GetIsSecure (&isSecure);
info->is_secure = isSecure != PR_FALSE;
- nsCookieStatus status;
- cookie->GetStatus (&status);
- info->p3p_state = (EphyCookieP3PState) status;
-
- nsCookiePolicy policy;
- cookie->GetPolicy (&policy);
- info->p3p_policy = (EphyCookieP3PPolicy) policy;
-
PRUint64 dateTime;
cookie->GetExpires (&dateTime);
info->expires = dateTime;