aboutsummaryrefslogtreecommitdiffstats
path: root/smime
diff options
context:
space:
mode:
Diffstat (limited to 'smime')
-rw-r--r--smime/ChangeLog8
-rw-r--r--smime/lib/e-cert-db.c7
2 files changed, 13 insertions, 2 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 22350de738..04f4804933 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-17 Not Zed <NotZed@Ximian.com>
+
+ ** See #59885.
+
+ * lib/e-cert-db.c (e_cert_db_import_pkcs12_file): move the #if
+ notyet stuff inside the function so the symbol is defined, since
+ we call it eslewhere. i dunno if it actually works yet.
+
2004-06-15 Jeffrey Stedfast <fejj@novell.com>
* lib/Makefile.am: Added smime-marshal.list to EXTRA_DIST
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 5b58c0cbcf..38e636be96 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -1114,12 +1114,12 @@ e_cert_db_import_certs_from_file (ECertDB *cert_db,
return rv;
}
-#if notyet
gboolean
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,8 +1129,11 @@ 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
+}
gboolean
e_cert_db_export_pkcs12_file (ECertDB *cert_db,