aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--smime/ChangeLog7
-rw-r--r--smime/gui/certificate-manager.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index f9fd35914e..3677604add 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,5 +1,12 @@
2009-04-07 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #539002
+
+ * gui/certificate-manager.c: (load_certs):
+ Show all other certificates in a contact tab.
+
+2009-04-07 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #529745
* gui/certificate-manager.c: (import_your), (import_contact):
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 330fef7187..2d1c8c17c4 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -963,7 +963,10 @@ load_certs (CertificateManagerData *cfm,
!CERT_LIST_END(node, certList);
node = CERT_LIST_NEXT(node)) {
ECert *cert = e_cert_new ((CERTCertificate*)node->cert);
- if (e_cert_get_cert_type(cert) == type) {
+ ECertType ct = e_cert_get_cert_type (cert);
+
+ /* show everything else in a contact tab */
+ if (ct == type || (type == E_CERT_CONTACT && ct != E_CERT_CA && ct != E_CERT_USER)) {
add_cert (cfm, cert);
}
}