aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2011-12-05 22:17:46 +0800
committerXan Lopez <xan@igalia.com>2011-12-05 22:17:46 +0800
commitb6256fd0e48a3ec6769662ddfd1cadf4cf0b8d99 (patch)
treed9f1765af254c780c7f25d3345187893329fae90 /embed
parent142d053dd3d7e6155c8f4891620178474469c42e (diff)
downloadgsoc2013-epiphany-b6256fd0e48a3ec6769662ddfd1cadf4cf0b8d99.tar
gsoc2013-epiphany-b6256fd0e48a3ec6769662ddfd1cadf4cf0b8d99.tar.gz
gsoc2013-epiphany-b6256fd0e48a3ec6769662ddfd1cadf4cf0b8d99.tar.bz2
gsoc2013-epiphany-b6256fd0e48a3ec6769662ddfd1cadf4cf0b8d99.tar.lz
gsoc2013-epiphany-b6256fd0e48a3ec6769662ddfd1cadf4cf0b8d99.tar.xz
gsoc2013-epiphany-b6256fd0e48a3ec6769662ddfd1cadf4cf0b8d99.tar.zst
gsoc2013-epiphany-b6256fd0e48a3ec6769662ddfd1cadf4cf0b8d99.zip
Remove last traces of dummy certificate manager
There was no implementation, so it was just polluting the codebase. In the future we probably want a non-optional implementation in the "Page details" section, using the soup/glib-network APIs.
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-single.c49
1 files changed, 0 insertions, 49 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 74359ecbc..df9be83e9 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -37,10 +37,6 @@
#include "ephy-settings.h"
#include "ephy-request-about.h"
-#ifdef ENABLE_CERTIFICATE_MANAGER
-#include "ephy-certificate-manager.h"
-#endif
-
#include <webkit/webkit.h>
#include <glib/gi18n.h>
#include <libsoup/soup-gnome.h>
@@ -65,9 +61,6 @@ enum {
static void ephy_embed_single_init (EphyEmbedSingle *single);
static void ephy_embed_single_class_init (EphyEmbedSingleClass *klass);
static void ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface);
-#ifdef ENABLE_CERTIFICATE_MANAGER
-static void ephy_certificate_manager_iface_init (EphyCertificateManagerIface *iface);
-#endif
static void
ephy_embed_single_get_property (GObject *object,
@@ -108,17 +101,9 @@ ephy_embed_single_set_property (GObject *object,
/* Some compilers (like gcc 2.95) don't support preprocessor directives inside macros,
so we have to duplicate the whole thing */
-#ifdef ENABLE_CERTIFICATE_MANAGER
G_DEFINE_TYPE_WITH_CODE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_CERTIFICATE_MANAGER,
- ephy_certificate_manager_iface_init)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER,
ephy_permission_manager_iface_init))
-#else
-G_DEFINE_TYPE_WITH_CODE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER,
- ephy_permission_manager_iface_init))
-#endif
static void
form_auth_data_free (EphyEmbedSingleFormAuthData *data)
@@ -404,40 +389,6 @@ ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface)
iface->list = impl_permission_manager_list;
}
-#ifdef ENABLE_CERTIFICATE_MANAGER
-
-static gboolean
-impl_remove_certificate (EphyCertificateManager *manager,
- EphyX509Cert *cert)
-{
- return TRUE;
-}
-
-#define NICK_DELIMITER PRUnichar ('\001')
-static GList *
-impl_get_certificates (EphyCertificateManager *manager,
- EphyX509CertType type)
-{
- return NULL;
-}
-
-static gboolean
-impl_import (EphyCertificateManager *manager,
- const gchar *file)
-{
- return TRUE;
-}
-
-static void
-ephy_certificate_manager_iface_init (EphyCertificateManagerIface *iface)
-{
- iface->get_certificates = impl_get_certificates;
- iface->remove_certificate = impl_remove_certificate;
- iface->import = impl_import;
-}
-
-#endif /* ENABLE_CERTIFICATE_MANAGER */
-
static void
cache_size_cb (GSettings *settings,
char *key,