diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2010-09-14 03:58:33 +0800 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-09-14 04:02:57 +0800 |
commit | 75d1c75617ccd515ca1ebee44dd47204e76f36e1 (patch) | |
tree | efec1ee2fbf37a403975d9fce838a9141313f4db /smime/gui/certificate-manager.c | |
parent | 515ad2e6901a913a500ef77a2f4a0cd70135dff0 (diff) | |
download | gsoc2013-evolution-75d1c75617ccd515ca1ebee44dd47204e76f36e1.tar gsoc2013-evolution-75d1c75617ccd515ca1ebee44dd47204e76f36e1.tar.gz gsoc2013-evolution-75d1c75617ccd515ca1ebee44dd47204e76f36e1.tar.bz2 gsoc2013-evolution-75d1c75617ccd515ca1ebee44dd47204e76f36e1.tar.lz gsoc2013-evolution-75d1c75617ccd515ca1ebee44dd47204e76f36e1.tar.xz gsoc2013-evolution-75d1c75617ccd515ca1ebee44dd47204e76f36e1.tar.zst gsoc2013-evolution-75d1c75617ccd515ca1ebee44dd47204e76f36e1.zip |
Bug 626066 - log in to NSS database on demand for changing trust
Diffstat (limited to 'smime/gui/certificate-manager.c')
-rw-r--r-- | smime/gui/certificate-manager.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 103b319ec3..624059c902 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -679,7 +679,7 @@ edit_ca (GtkWidget *widget, CertificateManagerData *cfm) trust_email, trust_objsign); - CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), icert, &trust); + e_cert_db_change_cert_trust (icert, &trust); } gtk_widget_destroy (dialog); @@ -1097,18 +1097,13 @@ certificate_manager_config_new (EPreferencesWindow *window) GtkWidget *parent; GtkWidget *widget; CertificateManagerData *cfm_data; - PK11SlotInfo* slot; - ECertDB *cert_db; shell = e_preferences_window_get_shell (window); g_return_val_if_fail (E_IS_SHELL (shell), NULL); /* We need to peek the db here to make sure it (and NSS) are fully initialized. */ - - cert_db = e_cert_db_peek(); - slot = PK11_GetInternalKeySlot(); - e_cert_db_login_to_slot(cert_db, slot); + e_cert_db_peek (); cfm_data = g_new0 (CertificateManagerData, 1); |