[evolution-patches] patch for s/mime bug #61490

[Chris Toshok <toshok ximian com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/smime/ChangeLog,v
retrieving revision 1.36
diff -u -r1.36 ChangeLog
--- ChangeLog	17 Jun 2004 15:47:26 -0000	1.36
+++ ChangeLog	16 Jul 2004 19:13:14 -0000
@@ -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
Index: lib/e-cert-db.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-cert-db.c,v
retrieving revision 1.13
diff -u -r1.13 e-cert-db.c
--- lib/e-cert-db.c	17 Jun 2004 03:27:21 -0000	1.13
+++ lib/e-cert-db.c	16 Jul 2004 19:13:14 -0000
@@ -1119,7 +1119,6 @@
 			      const char *file_path,
 			      GError **error)
 {
-#if notyet
 	EPKCS12 *pkcs12 = e_pkcs12_new ();
 	GError *e = NULL;
 
@@ -1129,12 +1128,9 @@
 	}
 
 	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 @@
 			      GError **error)
 {
 }
+#endif
 
 gboolean
 e_cert_db_login_to_slot (ECertDB *cert_db,