pidgin: fba601de: Remove the old deprecated purple_certifi...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: fba601deaa5884425524acde3e0ed0ba9fbfe191
Parent:   19269142b434e53275204054d880491c5eb24a1d
Author:   andrew.victor at mxit.com
Date:     09/24/11 12:36:57
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fba601deaa5884425524acde3e0ed0ba9fbfe191

Changelog: 

Remove the old deprecated purple_certificate_check_signature_chain.
Rename purple_certificate_check_signature_chain_with_failing to purple_certificate_check_signature_chain.


Changes against parent 19269142b434e53275204054d880491c5eb24a1d

  patched  ChangeLog.API
  patched  libpurple/certificate.c
  patched  libpurple/certificate.h
  patched  libpurple/plugins/perl/common/Certificate.xs

-------------- next part --------------
============================================================
--- ChangeLog.API	671ea4587295f5a6379bb7743a9ea878082845fd
+++ ChangeLog.API	8952abac2f759f718e1cb16af388dac1e764b54c
@@ -53,6 +53,8 @@ version 3.0.0 (??/??/????):
 		* 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
============================================================
--- libpurple/certificate.c	bbf17e3f3ee5f3296bfd889371f0d0dc54d4c7a6
+++ libpurple/certificate.c	acff7a354ab68c4259e96da14cee1a57abc3593d
@@ -275,7 +275,7 @@ gboolean
 }
 
 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 @@ purple_certificate_check_signature_chain
 	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 @@ x509_tls_cached_unknown_peer(PurpleCerti
 	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;
============================================================
--- libpurple/certificate.h	ce6122d62967a91f101c7d06ec0febe9910abfee
+++ libpurple/certificate.h	ff97a04181b9f176e386fcd65c5e31e7b33bee4a
@@ -462,33 +462,12 @@ purple_certificate_signed_by(PurpleCerti
  *                   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
============================================================
--- libpurple/plugins/perl/common/Certificate.xs	2f09254414a7b6add63b5d356827678cb68b1a25
+++ libpurple/plugins/perl/common/Certificate.xs	42ac5f504269c6685d874d000c44091c2d85d35e
@@ -202,7 +202,7 @@ purple_certificate_check_signature_chain
 			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;