aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2008-12-12 08:09:41 +0800
committerXan Lopez <xan@src.gnome.org>2008-12-12 08:09:41 +0800
commitc4d95ec8b49d437f3372390f1662c67bfd56b64b (patch)
treeae0e087b41c9850e43b322e01bd1fe03fe142073
parentd9316c22dde31d8fe2907ca30f23532412363d01 (diff)
downloadgsoc2013-epiphany-c4d95ec8b49d437f3372390f1662c67bfd56b64b.tar
gsoc2013-epiphany-c4d95ec8b49d437f3372390f1662c67bfd56b64b.tar.gz
gsoc2013-epiphany-c4d95ec8b49d437f3372390f1662c67bfd56b64b.tar.bz2
gsoc2013-epiphany-c4d95ec8b49d437f3372390f1662c67bfd56b64b.tar.lz
gsoc2013-epiphany-c4d95ec8b49d437f3372390f1662c67bfd56b64b.tar.xz
gsoc2013-epiphany-c4d95ec8b49d437f3372390f1662c67bfd56b64b.tar.zst
gsoc2013-epiphany-c4d95ec8b49d437f3372390f1662c67bfd56b64b.zip
Port ephy to use libsoup for cookies.
svn path=/trunk/; revision=8632
-rw-r--r--configure.ac2
-rw-r--r--embed/Makefile.am2
-rw-r--r--embed/ephy-cookie-manager.c258
-rw-r--r--embed/ephy-cookie-manager.h105
-rw-r--r--embed/webkit/webkit-embed-single.c31
-rw-r--r--src/Makefile.am1
-rw-r--r--src/epiphany.defs73
-rw-r--r--src/epiphany.h.in1
-rw-r--r--src/epiphany.override13
-rw-r--r--src/pdm-dialog.c203
10 files changed, 94 insertions, 595 deletions
diff --git a/configure.ac b/configure.ac
index 18fb4744e..0500c9a9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,7 @@ GNOME_DESKTOP_REQUIRED=2.9.91
LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
LIBNOTIFY_REQUIRED=0.4
DBUS_GLIB_REQUIRED=0.35
+LIBSOUP_REQUIRED=2.25.0
PKG_CHECK_EXISTS([libnotify >= $LIBNOTIFY_REQUIRED],[have_libnotify=yes],[have_libnotify=no])
@@ -144,6 +145,7 @@ PKG_CHECK_MODULES([DEPENDENCIES], [
gconf-2.0
libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
$LIBNOTIFY_PACKAGE
+ libsoup-2.4 >= $LIBSOUP_REQUIRED
])
AC_SUBST([DEPENDENCIES_CFLAGS])
AC_SUBST([DEPENDENCIES_LIBS])
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 114d0881e..c274a2e8b 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -21,7 +21,6 @@ INST_H_FILES = \
ephy-adblock-manager.h \
ephy-base-embed.h \
ephy-command-manager.h \
- ephy-cookie-manager.h \
ephy-embed.h \
ephy-embed-container.h \
ephy-embed-event.h \
@@ -45,7 +44,6 @@ libephyembed_la_SOURCES = \
ephy-base-embed.c \
downloader-view.c \
ephy-command-manager.c \
- ephy-cookie-manager.c \
ephy-download.c \
ephy-embed.c \
ephy-embed-container.c \
diff --git a/embed/ephy-cookie-manager.c b/embed/ephy-cookie-manager.c
deleted file mode 100644
index fe06907f2..000000000
--- a/embed/ephy-cookie-manager.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright © 2000-2003 Marco Pesenti Gritti
- * Copyright © 2003 Christian Persch
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Id$
- */
-
-#include "config.h"
-
-#include "ephy-cookie-manager.h"
-
-GType
-ephy_cookie_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- {
- type = g_boxed_type_register_static ("EphyCookie",
- (GBoxedCopyFunc) ephy_cookie_copy,
- (GBoxedFreeFunc) ephy_cookie_free);
- }
-
- return type;
-}
-
-/**
- * ephy_cookie_new:
- *
- * Return value: a new #EphyCookie.
- **/
-EphyCookie *
-ephy_cookie_new (void)
-{
- return g_slice_new0 (EphyCookie);
-}
-
-/**
- * ephy_cookie_copy:
- * @cookie: a #EphyCookie
- *
- * Return value: a copy of @cookie.
- **/
-EphyCookie *
-ephy_cookie_copy (const EphyCookie *cookie)
-{
- EphyCookie *copy = g_slice_new0 (EphyCookie);
-
- copy->name = g_strdup (cookie->name);
- copy->value = g_strdup (cookie->value);
- copy->domain = g_strdup (cookie->domain);
- copy->path = g_strdup (cookie->path);
- copy->expires = cookie->expires;
- copy->real_expires = cookie->real_expires;
- copy->is_secure = cookie->is_secure;
- copy->is_session = cookie->is_session;
-
- return copy;
-}
-
-/**
- * ephy_cookie_free:
- * @cookie: a #EphyCookie
- *
- * Frees @cookie.
- **/
-void
-ephy_cookie_free (EphyCookie *cookie)
-{
- if (cookie != NULL)
- {
- g_free (cookie->name);
- g_free (cookie->value);
- g_free (cookie->domain);
- g_free (cookie->path);
-
- g_slice_free (EphyCookie, cookie);
- }
-}
-
-/* EphyCookieManager */
-
-static void ephy_cookie_manager_base_init (gpointer base_iface);
-
-GType
-ephy_cookie_manager_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- {
- const GTypeInfo our_info =
- {
- sizeof (EphyCookieManagerIface),
- ephy_cookie_manager_base_init,
- NULL,
- };
-
- type = g_type_register_static (G_TYPE_INTERFACE,
- "EphyCookieManager",
- &our_info,
- (GTypeFlags) 0);
- }
-
- return type;
-}
-
-static void
-ephy_cookie_manager_base_init (gpointer base_iface)
-{
- static gboolean initialised = FALSE;
-
- if (initialised == FALSE)
- {
- /**
- * EphyCookieManager::cookie-added
- * @manager: the #EphyCookieManager
- * @cookie: the added #EphyCookie
- *
- * The cookie-added signal is emitted when a cookie has been added.
- **/
- g_signal_new ("cookie-added",
- EPHY_TYPE_COOKIE_MANAGER,
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EphyCookieManagerIface, added),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
- G_TYPE_NONE,
- 1,
- EPHY_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE);
-
- /**
- * EphyCookieManager::cookie-changed
- * @manager: the #EphyCookieManager
- * @cookie: the changed #EphyCookie
- *
- * The cookie-changed signal is emitted when a cookie has been changed.
- **/
- g_signal_new ("cookie-changed",
- EPHY_TYPE_COOKIE_MANAGER,
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EphyCookieManagerIface, changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
- G_TYPE_NONE,
- 1,
- EPHY_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE);
-
- /**
- * EphyCookieManager::cookie-deleted
- * @manager: the #EphyCookieManager
- * @cookie: the deleted #EphyCookie
- *
- * The cookie-deleted signal is emitted when a cookie has been deleted.
- **/
- g_signal_new ("cookie-deleted",
- EPHY_TYPE_COOKIE_MANAGER,
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EphyCookieManagerIface, deleted),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
- G_TYPE_NONE,
- 1,
- EPHY_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE);
-
- /**
- * EphyCookieManager::cookie-rejected
- * @manager: the #EphyCookieManager
- * @address: the address of the page that wanted to set the cookie
- *
- * The cookie-rejected signal is emitted when a cookie has been rejected.
- **/
- g_signal_new ("cookie-rejected",
- EPHY_TYPE_COOKIE_MANAGER,
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EphyCookieManagerIface, rejected),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE,
- 1,
- G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
-
- /**
- * EphyCookieManager::cookies-cleared
- * @manager: the #EphyCookieManager
- *
- * The cookies-cleared signal is emitted when the cookie database has
- * been cleared.
- **/
- g_signal_new ("cookies-cleared",
- EPHY_TYPE_COOKIE_MANAGER,
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EphyCookieManagerIface, cleared),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-
- initialised = TRUE;
- }
-}
-
-/**
- * ephy_cookie_manager_list_cookies:
- * @manager: the #EphyCookieManager
- *
- * Lists all cookies in the cookies database.
- *
- * Return value: the cookies list
- **/
-GList *
-ephy_cookie_manager_list_cookies (EphyCookieManager *manager)
-{
- EphyCookieManagerIface *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager);
- return iface->list (manager);
-}
-
-/**
- * ephy_cookie_manager_remove_cookie:
- * @manager: the #EphyCookieManager
- * @cookie: a #EphyCookie
- *
- * Removes @cookie from the cookies database. You must free @cookie yourself.
- **/
-void
-ephy_cookie_manager_remove_cookie (EphyCookieManager *manager,
- const EphyCookie *cookie)
-{
- EphyCookieManagerIface *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager);
- iface->remove (manager, cookie);
-}
-
-/**
- * ephy_cookie_manager_clear:
- * @manager: the #EphyCookieManager
- *
- * Clears the cookies database.
- **/
-void
-ephy_cookie_manager_clear (EphyCookieManager *manager)
-{
- EphyCookieManagerIface *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager);
- iface->clear (manager);
-}
diff --git a/embed/ephy-cookie-manager.h b/embed/ephy-cookie-manager.h
deleted file mode 100644
index 58d8788bd..000000000
--- a/embed/ephy-cookie-manager.h
+++ /dev/null
@@ -1,105 +0,0 @@
- /*
- * Copyright © 2003 Marco Pesenti Gritti
- * Copyright © 2003 Christian Persch
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Id$
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_COOKIE_MANAGER_H
-#define EPHY_COOKIE_MANAGER_H
-
-#include <glib-object.h>
-#include <glib.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_COOKIE_MANAGER (ephy_cookie_manager_get_type ())
-#define EPHY_COOKIE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManager))
-#define EPHY_COOKIE_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIface))
-#define EPHY_IS_COOKIE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_COOKIE_MANAGER))
-#define EPHY_IS_COOKIE_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COOKIE_MANAGER))
-#define EPHY_COOKIE_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIface))
-
-#define EPHY_TYPE_COOKIE (ephy_cookie_get_type ())
-
-typedef struct _EphyCookieManager EphyCookieManager;
-typedef struct _EphyCookieManagerIface EphyCookieManagerIface;
-
-typedef struct
-{
- char *name;
- char *value;
- char *domain;
- char *path;
- time_t expires;
- glong real_expires;
- guint is_secure : 1;
- guint is_session : 1;
- guint is_http_only : 1;
-} EphyCookie;
-
-struct _EphyCookieManagerIface
-{
- GTypeInterface base_iface;
-
- /* Signals */
- void (* added) (EphyCookieManager *manager,
- EphyCookie *cookie);
- void (* changed) (EphyCookieManager *manager,
- EphyCookie *cookie);
- void (* deleted) (EphyCookieManager *manager,
- EphyCookie *cookie);
- void (* rejected) (EphyCookieManager *manager,
- const char *url);
- void (* cleared) (EphyCookieManager *manager);
-
- /* Methods */
- GList * (* list) (EphyCookieManager *manager);
- void (* remove) (EphyCookieManager *manager,
- const EphyCookie *cookie);
- void (* clear) (EphyCookieManager *manager);
-};
-
-/* EphyCookie */
-
-GType ephy_cookie_get_type (void);
-
-EphyCookie *ephy_cookie_new (void);
-
-EphyCookie *ephy_cookie_copy (const EphyCookie *cookie);
-
-void ephy_cookie_free (EphyCookie *cookie);
-
-/* EphyCookieManager */
-
-GType ephy_cookie_manager_get_type (void);
-
-GList * ephy_cookie_manager_list_cookies (EphyCookieManager *manager);
-
-void ephy_cookie_manager_remove_cookie (EphyCookieManager *manager,
- const EphyCookie *cookie);
-
-void ephy_cookie_manager_clear (EphyCookieManager *manager);
-
-G_END_DECLS
-
-#endif
diff --git a/embed/webkit/webkit-embed-single.c b/embed/webkit/webkit-embed-single.c
index 2aa778c74..281662ea0 100644
--- a/embed/webkit/webkit-embed-single.c
+++ b/embed/webkit/webkit-embed-single.c
@@ -24,7 +24,6 @@
#include "webkit-embed-single.h"
#include "webkit-embed-prefs.h"
#include "ephy-embed-single.h"
-#include "ephy-cookie-manager.h"
#include "ephy-password-manager.h"
#include "ephy-permission-manager.h"
@@ -46,7 +45,6 @@ enum {
static void webkit_embed_single_class_init (WebKitEmbedSingleClass *klass);
static void webkit_embed_single_init (WebKitEmbedSingle *wes);
static void ephy_embed_single_iface_init (EphyEmbedSingleIface *iface);
-static void ephy_cookie_manager_iface_init (EphyCookieManagerIface *iface);
static void ephy_password_manager_iface_init (EphyPasswordManagerIface *iface);
static void ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface);
@@ -61,8 +59,6 @@ static void ephy_certificate_manager_iface_init (EphyCertificateManagerIface *if
G_DEFINE_TYPE_WITH_CODE (WebKitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_SINGLE,
ephy_embed_single_iface_init)
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_COOKIE_MANAGER,
- ephy_cookie_manager_iface_init)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_PASSWORD_MANAGER,
ephy_password_manager_iface_init)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_CERTIFICATE_MANAGER,
@@ -73,8 +69,6 @@ G_DEFINE_TYPE_WITH_CODE (WebKitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT,
G_DEFINE_TYPE_WITH_CODE (WebKitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_SINGLE,
ephy_embed_single_iface_init)
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_COOKIE_MANAGER,
- ephy_cookie_manager_iface_init)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_PASSWORD_MANAGER,
ephy_password_manager_iface_init)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER,
@@ -147,23 +141,6 @@ impl_get_font_list (EphyEmbedSingle *shell,
}
static GList *
-impl_list_cookies (EphyCookieManager *manager)
-{
- return NULL;
-}
-
-static void
-impl_remove_cookie (EphyCookieManager *manager,
- const EphyCookie *cookie)
-{
-}
-
-static void
-impl_clear_cookies (EphyCookieManager *manager)
-{
-}
-
-static GList *
impl_list_passwords (EphyPasswordManager *manager)
{
return NULL;
@@ -332,14 +309,6 @@ ephy_embed_single_iface_init (EphyEmbedSingleIface *iface)
}
static void
-ephy_cookie_manager_iface_init (EphyCookieManagerIface *iface)
-{
- iface->list = impl_list_cookies;
- iface->remove = impl_remove_cookie;
- iface->clear = impl_clear_cookies;
-}
-
-static void
ephy_password_manager_iface_init (EphyPasswordManagerIface *iface)
{
iface->add = impl_add_password;
diff --git a/src/Makefile.am b/src/Makefile.am
index ad7ff3646..f35b62c62 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -332,7 +332,6 @@ if ENABLE_PYTHON
BINDING_HEADERS_SRCDIR_IN = \
embed/ephy-command-manager.h \
- embed/ephy-cookie-manager.h \
embed/ephy-embed-event.h \
embed/ephy-embed-factory.h \
embed/ephy-embed.h \
diff --git a/src/epiphany.defs b/src/epiphany.defs
index b96b50560..ea2263275 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -20,12 +20,6 @@
(gtype-id "EPHY_TYPE_COMMAND_MANAGER")
)
-(define-interface CookieManager
- (in-module "Ephy")
- (c-name "EphyCookieManager")
- (gtype-id "EPHY_TYPE_COOKIE_MANAGER")
-)
-
(define-object Dialog
(in-module "Ephy")
(parent "GObject")
@@ -475,57 +469,6 @@
-;; From ../../embed/ephy-cookie-manager.h
-
-(define-function ephy_cookie_get_type
- (c-name "ephy_cookie_get_type")
- (return-type "GType")
-)
-
-(define-function ephy_cookie_new
- (c-name "ephy_cookie_new")
- (is-constructor-of "EphyCookie")
- (return-type "EphyCookie*")
-)
-
-(define-method copy
- (of-object "EphyCookie")
- (c-name "ephy_cookie_copy")
- (return-type "EphyCookie*")
-)
-
-(define-method free
- (of-object "EphyCookie")
- (c-name "ephy_cookie_free")
- (return-type "none")
-)
-
-(define-function ephy_cookie_manager_get_type
- (c-name "ephy_cookie_manager_get_type")
- (return-type "GType")
-)
-
-(define-method list_cookies
- (of-object "EphyCookieManager")
- (c-name "ephy_cookie_manager_list_cookies")
- (return-type "GList*")
-)
-
-(define-method remove_cookie
- (of-object "EphyCookieManager")
- (c-name "ephy_cookie_manager_remove_cookie")
- (return-type "none")
- (parameters
- '("const-EphyCookie*" "cookie")
- )
-)
-
-(define-method clear
- (of-object "EphyCookieManager")
- (c-name "ephy_cookie_manager_clear")
- (return-type "none")
-)
-
;; From ../../embed/ephy-embed-container.h
(define-method set_active_child
@@ -3520,22 +3463,6 @@
;; Boxed types ...
-(define-boxed Cookie
- (in-module "Ephy")
- (c-name "EphyCookie")
- (gtype-id "EPHY_TYPE_COOKIE")
- (fields
- '("char*" "name")
- '("char*" "value")
- '("char*" "domain")
- '("char*" "path")
- '("gulong" "expires")
- '("glong" "real_expires")
- '("guint" "is_secure")
- '("guint" "is_session")
- )
-)
-
(define-boxed PasswordInfo
(in-module "Ephy")
(c-name "EphyPasswordInfo")
diff --git a/src/epiphany.h.in b/src/epiphany.h.in
index 667f84283..e23d1a3a6 100644
--- a/src/epiphany.h.in
+++ b/src/epiphany.h.in
@@ -39,7 +39,6 @@
#include <epiphany/ephy-bookmarks.h>
#include <epiphany/ephy-bookmarks-type-builtins.h>
#include <epiphany/ephy-command-manager.h>
-#include <epiphany/ephy-cookie-manager.h>
#include <epiphany/ephy-dialog.h>
#include <epiphany/ephy-embed-container.h>
#include <epiphany/ephy-embed-event.h>
diff --git a/src/epiphany.override b/src/epiphany.override
index 28622fd6c..3b183a171 100644
--- a/src/epiphany.override
+++ b/src/epiphany.override
@@ -28,7 +28,6 @@ headers
#include "ephy-bookmarks.h"
#include "ephy-bookmarks-type-builtins.h"
#include "ephy-command-manager.h"
-#include "ephy-cookie-manager.h"
#include "ephy-dialog.h"
#include "ephy-embed-event.h"
#include "ephy-embed-factory.h"
@@ -360,18 +359,6 @@ _wrap_ephy_password_manager_list_passwords (PyGObject *self)
return _helper_wrap_boxed_glist (EPHY_TYPE_PASSWORD_INFO, list);
}
-%%
-override ephy_cookie_manager_list_cookies noargs
-static PyObject *
-_wrap_ephy_cookie_manager_list_cookies(PyGObject *self)
-{
- GList *list;
-
- list = ephy_cookie_manager_list_cookies(EPHY_COOKIE_MANAGER (self->obj));
-
- return _helper_wrap_boxed_glist (EPHY_TYPE_COOKIE, list);
-}
-%%
//override ephy_permission_manager_list_permissions kwargs
// static PyObject *
// _wrap_ephy_permission_manager_list_permissions (PyGObject *self,
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index a1b41f3ac..28c491487 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -24,7 +24,6 @@
#include "pdm-dialog.h"
#include "ephy-shell.h"
-#include "ephy-cookie-manager.h"
#include "ephy-file-helpers.h"
#include "ephy-password-manager.h"
#include "ephy-gui.h"
@@ -39,8 +38,11 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <libsoup/soup.h>
+#include <webkit/webkit.h>
#include <string.h>
+#include <time.h>
typedef struct PdmActionInfo PdmActionInfo;
@@ -123,12 +125,12 @@ EphyDialogProperty properties [] =
{ "pdm_dialog", NULL, PT_NORMAL, 0 },
{ "pdm_notebook", NULL, PT_NORMAL, 0 },
- { "cookies_treeview", NULL, PT_NORMAL, 0 },
- { "cookies_remove_button", NULL, PT_NORMAL, 0 },
- { "cookies_properties_button", NULL, PT_NORMAL, 0 },
- { "passwords_treeview", NULL, PT_NORMAL, 0 },
- { "passwords_remove_button", NULL, PT_NORMAL, 0 },
- { "passwords_show_button", NULL, PT_NORMAL, 0 },
+ { "cookies_treeview", NULL, PT_NORMAL, 0 },
+ { "cookies_remove_button", NULL, PT_NORMAL, 0 },
+ { "cookies_properties_button", NULL, PT_NORMAL, 0 },
+ { "passwords_treeview", NULL, PT_NORMAL, 0 },
+ { "passwords_remove_button", NULL, PT_NORMAL, 0 },
+ { "passwords_show_button", NULL, PT_NORMAL, 0 },
{ NULL }
};
@@ -137,7 +139,7 @@ static void pdm_dialog_class_init (PdmDialogClass *klass);
static void pdm_dialog_init (PdmDialog *dialog);
static void pdm_dialog_finalize (GObject *object);
-static void passwords_changed_cb (EphyPasswordManager *manager,
+static void passwords_changed_cb (EphyPasswordManager *manager,
PdmDialog *dialog);
@@ -186,6 +188,22 @@ typedef struct
guint num_checked;
} PdmClearAllDialogButtons;
+static SoupCookieJar*
+get_cookie_jar ()
+{
+ GSList *l;
+ /* This is not finished webkit API, just testing */
+ SoupSession* session = webkit_web_view_get_session ();
+
+ for (l = soup_session_get_features (session); l; l = l->next)
+ {
+ if (SOUP_IS_COOKIE_JAR (l->data))
+ return l->data;
+ }
+
+ return NULL;
+}
+
static void
clear_all_dialog_release_cb (PdmClearAllDialogButtons *data)
{
@@ -193,6 +211,18 @@ clear_all_dialog_release_cb (PdmClearAllDialogButtons *data)
}
static void
+clear_all_cookies (SoupCookieJar *jar)
+{
+ GSList *l, *p;
+
+ l = soup_cookie_jar_all_cookies (jar);
+ for (p = l; p; p = p->next)
+ soup_cookie_jar_delete_cookie (jar, (SoupCookie*)p->data);
+
+ soup_cookies_free (l);
+}
+
+static void
clear_all_dialog_response_cb (GtkDialog *dialog,
int response,
PdmClearAllDialogButtons *checkbuttons)
@@ -208,7 +238,7 @@ clear_all_dialog_response_cb (GtkDialog *dialog,
if (response == GTK_RESPONSE_OK)
{
if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_history)))
+ (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_history)))
{
EphyEmbedShell *shell;
EphyHistory *history;
@@ -218,17 +248,16 @@ clear_all_dialog_response_cb (GtkDialog *dialog,
ephy_history_clear (history);
}
if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_cookies)))
+ (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_cookies)))
{
- EphyCookieManager *manager;
+ SoupCookieJar *jar;
- manager = EPHY_COOKIE_MANAGER (ephy_embed_shell_get_embed_single
- (EPHY_EMBED_SHELL (ephy_shell)));
+ jar = get_cookie_jar ();
- ephy_cookie_manager_clear (manager);
+ clear_all_cookies (jar);
}
if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_passwords)))
+ (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_passwords)))
{
EphyPasswordManager *manager;
@@ -262,7 +291,7 @@ clear_all_dialog_response_cb (GtkDialog *dialog,
}
}
if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_cache)))
+ (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_cache)))
{
EphyEmbedShell *shell;
EphyEmbedSingle *single;
@@ -406,7 +435,7 @@ pdm_dialog_show_clear_all_dialog (EphyDialog *edialog,
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label),
_("<small><i><b>Note:</b> You cannot undo this action. "
- "The data you are choosing to clear "
+ "The data you are choosing to clear "
"will be deleted forever.</i></small>"));
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
label, FALSE, FALSE, 0);
@@ -588,7 +617,7 @@ setup_action (PdmActionInfo *action)
static void
show_cookies_properties (PdmDialog *dialog,
- EphyCookie *info)
+ SoupCookie *info)
{
GtkWidget *gdialog;
GtkWidget *table;
@@ -659,7 +688,7 @@ show_cookies_properties (PdmDialog *dialog,
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_FILL, GTK_FILL, 0, 0);
- label = gtk_label_new (info->is_secure ? _("Encrypted connections only") : _("Any type of connection") );
+ label = gtk_label_new (info->secure ? _("Encrypted connections only") : _("Any type of connection") );
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
gtk_widget_show (label);
@@ -674,14 +703,16 @@ show_cookies_properties (PdmDialog *dialog,
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
GTK_FILL, GTK_FILL, 0, 0);
- if (info->is_session)
+ if (info->expires == NULL)
{
+ /* Session cookie */
str = g_strdup (_("End of current session"));
}
else
{
struct tm t;
- str = eel_strdup_strftime ("%c", localtime_r (&info->expires, &t));
+ time_t out = soup_date_to_time_t(info->expires);
+ str = eel_strdup_strftime ("%c", localtime_r (&out, &t));
}
label = gtk_label_new (str);
g_free (str);
@@ -711,7 +742,7 @@ cookies_properties_clicked_cb (GtkWidget *button,
GValue val = {0, };
GtkTreeIter iter;
GtkTreePath *path;
- EphyCookie *cookie;
+ SoupCookie *cookie;
GList *l;
GtkTreeSelection *selection;
@@ -723,7 +754,7 @@ cookies_properties_clicked_cb (GtkWidget *button,
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_model_get_value
(model, &iter, COL_COOKIES_DATA, &val);
- cookie = (EphyCookie *) g_value_get_boxed (&val);
+ cookie = (SoupCookie *) g_value_get_boxed (&val);
show_cookies_properties (dialog, cookie);
@@ -792,7 +823,7 @@ pdm_dialog_cookies_construct (PdmActionInfo *info)
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
- EPHY_TYPE_COOKIE);
+ SOUP_TYPE_COOKIE);
gtk_tree_view_set_model (treeview, GTK_TREE_MODEL(liststore));
gtk_tree_view_set_headers_visible (treeview, TRUE);
selection = gtk_tree_view_get_selection (treeview);
@@ -844,19 +875,8 @@ pdm_dialog_cookies_construct (PdmActionInfo *info)
}
static gboolean
-compare_cookies (const EphyCookie *cookie1,
- const EphyCookie *cookie2)
-{
- g_return_val_if_fail (cookie1 != NULL || cookie2 != NULL, FALSE);
-
- return (strcmp (cookie1->domain, cookie2->domain) == 0
- && strcmp (cookie1->path, cookie2->path) == 0
- && strcmp (cookie1->name, cookie2->name) == 0);
-}
-
-static gboolean
cookie_to_iter (GtkTreeModel *model,
- const EphyCookie *cookie,
+ const SoupCookie *cookie,
GtkTreeIter *iter)
{
gboolean valid;
@@ -866,15 +886,15 @@ cookie_to_iter (GtkTreeModel *model,
while (valid)
{
- EphyCookie *data;
+ SoupCookie *data;
gtk_tree_model_get (model, iter,
COL_COOKIES_DATA, &data,
-1);
- found = compare_cookies (cookie, data);
+ found = soup_cookie_equal (cookie, data);
- ephy_cookie_free (data);
+ soup_cookie_free (data);
if (found) break;
@@ -885,20 +905,9 @@ cookie_to_iter (GtkTreeModel *model,
}
static void
-cookie_added_cb (EphyCookieManager *manager,
- const EphyCookie *cookie,
- PdmDialog *dialog)
-{
- PdmActionInfo *info = dialog->priv->cookies;
-
- LOG ("cookie_added_cb");
-
- info->add (info, (gpointer) ephy_cookie_copy (cookie));
-}
-
-static void
-cookie_changed_cb (EphyCookieManager *manager,
- const EphyCookie *cookie,
+cookie_changed_cb (SoupCookieJar *jar,
+ const SoupCookie *old_cookie,
+ const SoupCookie *new_cookie,
PdmDialog *dialog)
{
PdmActionInfo *info = dialog->priv->cookies;
@@ -906,48 +915,30 @@ cookie_changed_cb (EphyCookieManager *manager,
LOG ("cookie_changed_cb");
- if (cookie_to_iter (info->model, cookie, &iter))
- {
- gtk_list_store_remove (GTK_LIST_STORE (info->model), &iter);
- info->add (info, (gpointer) ephy_cookie_copy (cookie));
- }
- else
- {
- g_warning ("Unable to find changed cookie in list!\n");
- }
-}
-
-static void
-cookie_deleted_cb (EphyCookieManager *manager,
- const EphyCookie *cookie,
- PdmDialog *dialog)
-{
- PdmActionInfo *info = dialog->priv->cookies;
- GtkTreeIter iter;
-
- LOG ("cookie_deleted_cb");
+ g_return_if_fail (info);
- if (cookie_to_iter (info->model, cookie, &iter))
+ if (old_cookie)
{
- gtk_list_store_remove (GTK_LIST_STORE (info->model), &iter);
+ /* Cookie changed or deleted, let's get rid of the old one
+ in any case */
+ if (cookie_to_iter (info->model, old_cookie, &iter))
+ {
+ gtk_list_store_remove (GTK_LIST_STORE (info->model), &iter);
+ }
+ else
+ {
+ g_warning ("Unable to find changed cookie in list!\n");
+ }
}
- else
+
+ if (new_cookie)
{
- g_warning ("Unable to find deleted cookie in list!\n");
+ /* Cookie changed or added, let's add the new cookie in
+ any case */
+ info->add (info, (gpointer) soup_cookie_copy (new_cookie));
}
}
-static void
-cookies_cleared_cb (EphyCookieManager *manager,
- PdmDialog *dialog)
-{
- PdmActionInfo *info = dialog->priv->cookies;
-
- LOG ("cookies_cleared_cb");
-
- gtk_list_store_clear (GTK_LIST_STORE (info->model));
-}
-
static gboolean
cookie_host_to_iter (GtkTreeModel *model,
const char *key1,
@@ -1039,15 +1030,13 @@ compare_cookie_host_keys (GtkTreeModel *model,
static void
pdm_dialog_fill_cookies_list (PdmActionInfo *info)
{
- EphyCookieManager *manager;
- GList *list, *l;
+ SoupCookieJar *jar;
+ GSList *list, *l;
g_assert (info->filled == FALSE);
- manager = EPHY_COOKIE_MANAGER (ephy_embed_shell_get_embed_single
- (EPHY_EMBED_SHELL (ephy_shell)));
-
- list = ephy_cookie_manager_list_cookies (manager);
+ jar = get_cookie_jar ();
+ list = soup_cookie_jar_all_cookies (jar);
for (l = list; l != NULL; l = l->next)
{
@@ -1055,7 +1044,7 @@ pdm_dialog_fill_cookies_list (PdmActionInfo *info)
}
/* the element data has been consumed, so we need only to free the list */
- g_list_free (list);
+ g_slist_free (list);
/* Now turn on sorting */
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (info->model),
@@ -1068,15 +1057,8 @@ pdm_dialog_fill_cookies_list (PdmActionInfo *info)
info->filled = TRUE;
- /* Now connect the callbacks on the EphyCookieManager */
- g_signal_connect (manager, "cookie-added",
- G_CALLBACK (cookie_added_cb), info->dialog);
- g_signal_connect (manager, "cookie-changed",
- G_CALLBACK (cookie_changed_cb), info->dialog);
- g_signal_connect (manager, "cookie-deleted",
- G_CALLBACK (cookie_deleted_cb), info->dialog);
- g_signal_connect (manager, "cookies-cleared",
- G_CALLBACK (cookies_cleared_cb), info->dialog);
+ g_signal_connect (jar, "changed",
+ G_CALLBACK (cookie_changed_cb), info->dialog);
info->scroll_to (info);
}
@@ -1092,7 +1074,7 @@ static void
pdm_dialog_cookie_add (PdmActionInfo *info,
gpointer data)
{
- EphyCookie *cookie = (EphyCookie *) data;
+ SoupCookie *cookie = (SoupCookie *) data;
GtkListStore *store;
GtkTreeIter iter;
int column[4] = { COL_COOKIES_HOST, COL_COOKIES_HOST_KEY, COL_COOKIES_NAME, COL_COOKIES_DATA };
@@ -1109,7 +1091,7 @@ pdm_dialog_cookie_add (PdmActionInfo *info,
g_value_init (&value[0], G_TYPE_STRING);
g_value_init (&value[1], G_TYPE_STRING);
g_value_init (&value[2], G_TYPE_STRING);
- g_value_init (&value[3], EPHY_TYPE_COOKIE);
+ g_value_init (&value[3], SOUP_TYPE_COOKIE);
g_value_set_static_string (&value[0], cookie->domain);
g_value_take_string (&value[1], ephy_string_collate_key_for_domain (cookie->domain, -1));
@@ -1130,13 +1112,12 @@ static void
pdm_dialog_cookie_remove (PdmActionInfo *info,
gpointer data)
{
- EphyCookie *cookie = (EphyCookie *) data;
- EphyCookieManager *manager;
+ SoupCookie *cookie = (SoupCookie *) data;
+ SoupCookieJar *jar;
- manager = EPHY_COOKIE_MANAGER (ephy_embed_shell_get_embed_single
- (EPHY_EMBED_SHELL (ephy_shell)));
+ jar = get_cookie_jar();
- ephy_cookie_manager_remove_cookie (manager, cookie);
+ soup_cookie_jar_delete_cookie (jar, cookie);
}
static void