From 968076a0dc52a91724a631d184677131aa72c3c0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 22 Sep 2013 10:23:33 -0400 Subject: [PATCH] Add camel_cert_new(). Replaces camel_certdb_cert_new(); removes the CamelCertDB argument. --- camel/camel-certdb.c | 6 ++---- camel/camel-certdb.h | 2 +- camel/camel-tcp-stream-ssl.c | 2 +- docs/reference/camel/camel-sections.txt | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c index d4e38de..95c6d0e 100644 --- a/camel/camel-certdb.c +++ b/camel/camel-certdb.c @@ -260,7 +260,7 @@ certdb_cert_load (CamelCertDB *certdb, { CamelCert *cert; - cert = camel_certdb_cert_new (certdb); + cert = camel_cert_new (); if (camel_file_util_decode_string (istream, &cert->issuer) == -1) goto error; @@ -587,12 +587,10 @@ camel_certdb_remove_host (CamelCertDB *certdb, } CamelCert * -camel_certdb_cert_new (CamelCertDB *certdb) +camel_cert_new (void) { CamelCert *cert; - g_return_val_if_fail (CAMEL_IS_CERTDB (certdb), NULL); - cert = g_slice_new0 (CamelCert); cert->refcount = 1; diff --git a/camel/camel-certdb.h b/camel/camel-certdb.h index 5480524..6f0fa35 100644 --- a/camel/camel-certdb.h +++ b/camel/camel-certdb.h @@ -139,7 +139,7 @@ void camel_certdb_put (CamelCertDB *certdb, CamelCert *cert); /* Remove any user-accepted certificate for the given hostname. */ void camel_certdb_remove_host (CamelCertDB *certdb, const gchar *hostname, const gchar *fingerprint); -CamelCert *camel_certdb_cert_new (CamelCertDB *certdb); +CamelCert *camel_cert_new (void); void camel_certdb_cert_ref (CamelCertDB *certdb, CamelCert *cert); void camel_certdb_cert_unref (CamelCertDB *certdb, CamelCert *cert); diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c index 97f053c..946a0fd 100644 --- a/camel/camel-tcp-stream-ssl.c +++ b/camel/camel-tcp-stream-ssl.c @@ -370,7 +370,7 @@ camel_certdb_nss_cert_convert (CamelCertDB *certdb, fingerprint = cert_fingerprint (cert); - ccert = camel_certdb_cert_new (certdb); + ccert = camel_cert_new (); camel_cert_set_issuer (certdb, ccert, CERT_NameToAscii (&cert->issuer)); camel_cert_set_subject (certdb, ccert, CERT_NameToAscii (&cert->subject)); /* hostname is set in caller */ diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt index 0d63e11..bb2626c 100644 --- a/docs/reference/camel/camel-sections.txt +++ b/docs/reference/camel/camel-sections.txt @@ -95,7 +95,7 @@ camel_certdb_touch camel_certdb_get_host camel_certdb_put camel_certdb_remove_host -camel_certdb_cert_new +camel_cert_new camel_certdb_cert_ref camel_certdb_cert_unref camel_certdb_clear -- 2.7.4