diff options
| -rw-r--r-- | smime/ChangeLog | 4 | ||||
| -rw-r--r-- | smime/lib/e-cert-db.c | 10 | ||||
| -rw-r--r-- | smime/lib/e-cert-db.h | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog index 075b340826..c88116dc6a 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,7 @@ +2004-06-08 Chris Toshok <toshok@ximian.com> + + * lib/e-cert-db.[ch]: quiet the compiler, and dobey. + 2004-05-28 Not Zed <NotZed@Ximian.com> * gui/certificate-manager.c (initialize_yourcerts_ui): set some diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 5a76619e16..5b58c0cbcf 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -128,6 +128,7 @@ e_cert_db_dispose (GObject *object) G_OBJECT_CLASS (parent_class)->dispose (object); } +#if notyet PRBool ucs2_ascii_conversion_fn (PRBool toUnicode, unsigned char *inBuf, @@ -139,6 +140,7 @@ ucs2_ascii_conversion_fn (PRBool toUnicode, { printf ("in ucs2_ascii_conversion_fn\n"); } +#endif static char* PR_CALLBACK pk11_password (PK11SlotInfo* slot, PRBool retry, void* arg) @@ -203,7 +205,9 @@ initialize_nss (void) SEC_PKCS12EnableCipher(PKCS12_DES_56, 1); SEC_PKCS12EnableCipher(PKCS12_DES_EDE3_168, 1); SEC_PKCS12SetPreferredCipher(PKCS12_DES_EDE3_168, 1); +#if notyet PORT_SetUCS2_ASCIIConversionFunction(ucs2_ascii_conversion_fn); +#endif } static void @@ -377,12 +381,12 @@ e_cert_db_find_cert_by_nickname (ECertDB *certdb, } } +#if notyet ECert* e_cert_db_find_cert_by_key (ECertDB *certdb, const char *db_key, GError **error) { -#if 0 /* nsNSSShutDownPreventionLock locker;*/ SECItem keyItem = {siBuffer, NULL, 0}; SECItem *dummy; @@ -418,7 +422,6 @@ e_cert_db_find_cert_by_key (ECertDB *certdb, /* XXX gerror */ return NULL; -#endif } GList* @@ -441,6 +444,7 @@ e_cert_db_find_email_signing_cert (ECertDB *certdb, GError **error) { } +#endif ECert* e_cert_db_find_cert_by_email_address (ECertDB *certdb, @@ -1110,6 +1114,7 @@ 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, @@ -1125,6 +1130,7 @@ e_cert_db_import_pkcs12_file (ECertDB *cert_db, return TRUE; } +#endif gboolean e_cert_db_export_pkcs12_file (ECertDB *cert_db, diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h index 59cd10906a..87683c6bf5 100644 --- a/smime/lib/e-cert-db.h +++ b/smime/lib/e-cert-db.h @@ -72,6 +72,7 @@ ECert* e_cert_db_find_cert_by_nickname (ECertDB *certdb, const char *nickname, GError **error); +#if notyet ECert* e_cert_db_find_cert_by_key (ECertDB *certdb, const char *db_key, GError **error); @@ -88,6 +89,7 @@ ECert* e_cert_db_find_email_encryption_cert (ECertDB *certdb, ECert* e_cert_db_find_email_signing_cert (ECertDB *certdb, const char *nickname, GError **error); +#endif ECert* e_cert_db_find_cert_by_email_address (ECertDB *certdb, const char *nickname, @@ -124,10 +126,12 @@ gboolean e_cert_db_import_pkcs12_file (ECertDB *cert_db, const char *file_path, GError **error); +#if notyet gboolean e_cert_db_export_pkcs12_file (ECertDB *cert_db, const char *file_path, GList *certs, GError **error); +#endif gboolean e_cert_db_login_to_slot (ECertDB *cert_db, PK11SlotInfo *slot); |