diff options
| -rw-r--r-- | smime/ChangeLog | 9 | ||||
| -rw-r--r-- | smime/lib/e-cert-db.c | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog index 5b8f855db5..0c5db3c700 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,12 @@ +2004-07-16 Chris Toshok <toshok@ximian.com> + + [ fixes #61490 ] + + * lib/e-cert-db.c (e_cert_db_import_pkcs12_file): un-ifdef this, + as it's working.. + (e_cert_db_export_pkcs12_file): and ifdef this one, since it's the + function i meant to ifdef in the first place. + 2004-06-17 JP Rosevear <jpr@novell.com> Fixes #56458 diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 38e636be96..13fdf603a6 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -1119,7 +1119,6 @@ e_cert_db_import_pkcs12_file (ECertDB *cert_db, const char *file_path, GError **error) { -#if notyet EPKCS12 *pkcs12 = e_pkcs12_new (); GError *e = NULL; @@ -1129,12 +1128,9 @@ e_cert_db_import_pkcs12_file (ECertDB *cert_db, } return TRUE; -#else -#warning "e_cert_db_import_pkcs12_file not implemented yet" - return FALSE; -#endif } +#if notyet gboolean e_cert_db_export_pkcs12_file (ECertDB *cert_db, const char *file_path, @@ -1142,6 +1138,7 @@ e_cert_db_export_pkcs12_file (ECertDB *cert_db, GError **error) { } +#endif gboolean e_cert_db_login_to_slot (ECertDB *cert_db, |