diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-12-11 22:40:15 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-12-11 22:40:15 +0800 |
| commit | fbe31b361697275f1cf071d02ade300cf54e61a7 (patch) | |
| tree | 9493efe263f5b9b16dbeb235db549b008e5f8ca9 /src/ephy-window.c | |
| parent | aabe93c2482f2371648e1e191d774ca127149ffa (diff) | |
| download | gsoc2013-epiphany-fbe31b361697275f1cf071d02ade300cf54e61a7.tar gsoc2013-epiphany-fbe31b361697275f1cf071d02ade300cf54e61a7.tar.gz gsoc2013-epiphany-fbe31b361697275f1cf071d02ade300cf54e61a7.tar.bz2 gsoc2013-epiphany-fbe31b361697275f1cf071d02ade300cf54e61a7.tar.lz gsoc2013-epiphany-fbe31b361697275f1cf071d02ade300cf54e61a7.tar.xz gsoc2013-epiphany-fbe31b361697275f1cf071d02ade300cf54e61a7.tar.zst gsoc2013-epiphany-fbe31b361697275f1cf071d02ade300cf54e61a7.zip | |
A embed/ephy-certificate-manager.c: A embed/ephy-certificate-manager.h: A
2005-12-11 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
* data/glade/Makefile.am:
* data/glade/certs-manager.glade:
* data/ui/epiphany-ui.xml:
* embed/Makefile.am:
A embed/ephy-certificate-manager.c:
A embed/ephy-certificate-manager.h:
A embed/ephy-x509-cert.c:
A embed/ephy-x509-cert.h:
* embed/mozilla/Makefile.am:
* embed/mozilla/mozilla-embed-single.cpp:
A embed/mozilla/mozilla-x509-cert.cpp:
A embed/mozilla/mozilla-x509-cert.h:
* src/Makefile.am:
A src/ephy-certificate-manager.c:
A src/ephy-certificate-manager.h:
* src/ephy-window.c:
* src/window-commands.c:
* src/window-commands.h:
Add certificate manager. Patch by Robert Marcano and Crispin
Flowerday. Fixes bug #119090.
Diffstat (limited to 'src/ephy-window.c')
| -rw-r--r-- | src/ephy-window.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 87cb491f8..0a6b64e1b 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -185,6 +185,11 @@ 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) }, +#ifdef ENABLE_CERTIFICATE_MANAGER + { "EditCertificates", NULL, N_("Cert_ificates"), NULL, + N_("Manage Certificates"), + G_CALLBACK (window_cmd_edit_certificates) }, +#endif { "EditToolbar", NULL, N_("T_oolbars"), NULL, N_("Customize toolbars"), G_CALLBACK (window_cmd_edit_toolbar) }, @@ -3085,6 +3090,16 @@ 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 /* Initialize the menus */ priv->tabs_menu = ephy_tabs_menu_new (window); |