# HG changeset patch
# User andrew.victor@mxit.com
# Date 1316882217 0
# Node ID 1bcedeb32bb4de4cb4a6a8a8c4c968c7115c4a2c
# Parent  fa4b88cf8b566bce2d88ad29e2480202c05e5609
Remove the old deprecated purple_certificate_check_signature_chain.
Rename purple_certificate_check_signature_chain_with_failing to purple_certificate_check_signature_chain.

diff -r fa4b88cf8b56 -r 1bcedeb32bb4 ChangeLog.API
--- a/ChangeLog.API	Fri Sep 23 18:24:01 2011 +0000
+++ b/ChangeLog.API	Sat Sep 24 16:36:57 2011 +0000
@@ -53,6 +53,8 @@
 		* xmlnode_strip_prefixes
 
 		Changed:
+		* purple_certificate_check_signature_chain_with_failing renamed
+		  to purple_certificate_check_signature_chain
 		* purple_connection_error now takes a PurpleConnectionError
 		  as the second parameter
 		* purple_notify_user_info_add_pair renamed to
diff -r fa4b88cf8b56 -r 1bcedeb32bb4 libpurple/certificate.c
--- a/libpurple/certificate.c	Fri Sep 23 18:24:01 2011 +0000
+++ b/libpurple/certificate.c	Sat Sep 24 16:36:57 2011 +0000
@@ -275,7 +275,7 @@
 }
 
 gboolean
-purple_certificate_check_signature_chain_with_failing(GList *chain,
+purple_certificate_check_signature_chain(GList *chain,
                                                       PurpleCertificate **failing)
 {
 	GList *cur;
@@ -363,12 +363,6 @@
 	return TRUE;
 }
 
-gboolean
-purple_certificate_check_signature_chain(GList *chain)
-{
-	return purple_certificate_check_signature_chain_with_failing(chain, NULL);
-}
-
 PurpleCertificate *
 purple_certificate_import(PurpleCertificateScheme *scheme, const gchar *filename)
 {
@@ -1622,7 +1616,7 @@
 	ca = purple_certificate_find_pool(x509_tls_cached.scheme_name, "ca");
 
 	/* Next, check that the certificate chain is valid */
-	if (!purple_certificate_check_signature_chain_with_failing(chain,
+	if (!purple_certificate_check_signature_chain(chain,
 				&failing_crt))
 	{
 		gboolean chain_validated = FALSE;
diff -r fa4b88cf8b56 -r 1bcedeb32bb4 libpurple/certificate.h
--- a/libpurple/certificate.h	Fri Sep 23 18:24:01 2011 +0000
+++ b/libpurple/certificate.h	Sat Sep 24 16:36:57 2011 +0000
@@ -462,33 +462,12 @@
  *                   chain fails to validate, this will be set to the
  *                   certificate whose signature could not be validated.
  * @return TRUE if the chain is valid. See description.
- *
- * @since 2.6.0
- * @deprecated  This function will become
- *              purple_certificate_check_signature_chain in 3.0.0
  */
 gboolean
-purple_certificate_check_signature_chain_with_failing(GList *chain,
+purple_certificate_check_signature_chain(GList *chain,
 		PurpleCertificate **failing);
 
 /**
- * Check that a certificate chain is valid
- *
- * Uses purple_certificate_signed_by() to verify that each PurpleCertificate
- * in the chain carries a valid signature from the next. A single-certificate
- * chain is considered to be valid.
- *
- * @param chain      List of PurpleCertificate instances comprising the chain,
- *                   in the order certificate, issuer, issuer's issuer, etc.
- * @return TRUE if the chain is valid. See description.
- * @todo Specify which certificate in the chain caused a failure
- * @deprecated  This function will be removed in 3.0.0 and replaced with
- *              purple_certificate_check_signature_chain_with_failing
- */
-gboolean
-purple_certificate_check_signature_chain(GList *chain);
-
-/**
  * Imports a PurpleCertificate from a file
  *
  * @param scheme      Scheme to import under
diff -r fa4b88cf8b56 -r 1bcedeb32bb4 libpurple/plugins/perl/common/Certificate.xs
--- a/libpurple/plugins/perl/common/Certificate.xs	Fri Sep 23 18:24:01 2011 +0000
+++ b/libpurple/plugins/perl/common/Certificate.xs	Sat Sep 24 16:36:57 2011 +0000
@@ -202,7 +202,7 @@
 			l = g_list_prepend(l, purple_perl_ref_object(ST(i)));
 		}
 		l = g_list_reverse(l);
-		ret = purple_certificate_check_signature_chain(l);
+		ret = purple_certificate_check_signature_chain(l, NULL);
 		g_list_free(l);
 		if(ret) XSRETURN_YES;
 		XSRETURN_NO;