diff options
| -rw-r--r-- | data/ui/epiphany-ui.xml | 1 | ||||
| -rw-r--r-- | embed/ephy-embed-single.c | 49 | ||||
| -rw-r--r-- | src/ephy-window.c | 15 | ||||
| -rw-r--r-- | src/window-commands.c | 8 | ||||
| -rw-r--r-- | src/window-commands.h | 3 |
5 files changed, 0 insertions, 76 deletions
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml index a962341f3..f870b0b7c 100644 --- a/data/ui/epiphany-ui.xml +++ b/data/ui/epiphany-ui.xml @@ -32,7 +32,6 @@ <menuitem name="EditFindPrevMenu" action="EditFindPrev"/> <separator name="EditSep3"/> <menuitem name="EditPersonalDataMenu" action="EditPersonalData"/> - <!-- <menuitem name="EditCertificatesMenu" action="EditCertificates"/> --> <menuitem name="EditPrefsMenu" action="EditPrefs"/> </menu> 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, diff --git a/src/ephy-window.c b/src/ephy-window.c index d07bb3b1d..774629a22 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -176,11 +176,6 @@ static const GtkActionEntry ephy_menu_entries [] = { { "EditPersonalData", NULL, N_("P_ersonal Data"), NULL, N_("View and remove cookies and passwords"), G_CALLBACK (window_cmd_edit_personal_data) }, -#if 0 - { "EditCertificates", NULL, N_("Certificate_s"), NULL, - N_("Manage Certificates"), - G_CALLBACK (window_cmd_edit_certificates) }, -#endif { "EditPrefs", GTK_STOCK_PREFERENCES, N_("P_references"), NULL, N_("Configure the web browser"), G_CALLBACK (window_cmd_edit_prefs) }, @@ -3687,16 +3682,6 @@ ephy_window_constructor (GType type, g_warning ("Could not merge epiphany-ui.xml: %s", error->message); g_error_free (error); } -#if ENABLE_CERTIFICATE_MANAGER -{ - guint ui_id; - ui_id = gtk_ui_manager_new_merge_id (priv->manager); - gtk_ui_manager_add_ui (priv->manager, ui_id, - "/menubar/EditMenu/EditPersonalDataMenu", - "EditCertificates", "EditCertificates", - GTK_UI_MANAGER_MENUITEM, FALSE); -} -#endif /* Attach the CSS provider to the window */ css_file = g_file_new_for_path (ephy_file ("epiphany.css")); diff --git a/src/window-commands.c b/src/window-commands.c index e066997d1..ace995d9d 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -1202,14 +1202,6 @@ window_cmd_edit_personal_data (GtkAction *action, g_free (host); } -#if 0 -void -window_cmd_edit_certificates (GtkAction *action, - EphyWindow *window) -{ -} -#endif - void window_cmd_edit_prefs (GtkAction *action, EphyWindow *window) diff --git a/src/window-commands.h b/src/window-commands.h index e20ca1a06..1261fa41f 100644 --- a/src/window-commands.h +++ b/src/window-commands.h @@ -126,9 +126,6 @@ void window_cmd_go_history (GtkAction *action, void window_cmd_edit_personal_data (GtkAction *action, EphyWindow *window); -void window_cmd_edit_certificates (GtkAction *action, - EphyWindow *window); - void window_cmd_edit_prefs (GtkAction *action, EphyWindow *window); |