aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2010-09-12 22:54:00 +0800
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-09-13 00:00:44 +0800
commitfab32c94a18a03f8f665b3946dd2af102a0c4adc (patch)
tree6512be3c1ebf6268cdc12873f3e137459fabae8b
parenta6e9acaab31a9381c4808adcd0b9c6ab6eac345a (diff)
downloadgsoc2013-evolution-fab32c94a18a03f8f665b3946dd2af102a0c4adc.tar
gsoc2013-evolution-fab32c94a18a03f8f665b3946dd2af102a0c4adc.tar.gz
gsoc2013-evolution-fab32c94a18a03f8f665b3946dd2af102a0c4adc.tar.bz2
gsoc2013-evolution-fab32c94a18a03f8f665b3946dd2af102a0c4adc.tar.lz
gsoc2013-evolution-fab32c94a18a03f8f665b3946dd2af102a0c4adc.tar.xz
gsoc2013-evolution-fab32c94a18a03f8f665b3946dd2af102a0c4adc.tar.zst
gsoc2013-evolution-fab32c94a18a03f8f665b3946dd2af102a0c4adc.zip
Bug 626066 - log in to NSS database before invoking certificate manager
-rw-r--r--smime/gui/certificate-manager.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 5ef7c03d38..d0823b8acb 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -1097,13 +1097,18 @@ 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. */
- e_cert_db_peek ();
+
+ cert_db = e_cert_db_peek();
+ slot = PK11_GetInternalKeySlot();
+ e_cert_db_login_to_slot(cert_db, slot);
cfm_data = g_new0 (CertificateManagerData, 1);