pidgin: 227e8310: Remove deprecated purple_ssl_connect_fd(...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 227e83102ab14599d8c9e36fc1f506cd37899027
Parent:   552f21c9866b39c95a546188fd2abafd061516b1
Author:   andrew.victor at mxit.com
Date:     09/15/11 17:57:04
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/227e83102ab14599d8c9e36fc1f506cd37899027

Changelog: 

Remove deprecated purple_ssl_connect_fd().


Changes against parent 552f21c9866b39c95a546188fd2abafd061516b1

  patched  ChangeLog.API
  patched  libpurple/plugins/perl/common/SSLConn.xs
  patched  libpurple/sslconn.c
  patched  libpurple/sslconn.h

-------------- next part --------------
============================================================
--- libpurple/sslconn.c	31b8e25e3ce31929d3f6941674a74187fbf20dee
+++ libpurple/sslconn.c	a6ac0febfadc512a390810ee0818a62a5a1c8d97
@@ -185,15 +185,6 @@ PurpleSslConnection *
 }
 
 PurpleSslConnection *
-purple_ssl_connect_fd(PurpleAccount *account, int fd,
-					PurpleSslInputFunction func,
-					PurpleSslErrorFunction error_func,
-                    void *data)
-{
-    return purple_ssl_connect_with_host_fd(account, fd, func, error_func, NULL, data);
-}
-
-PurpleSslConnection *
 purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd,
                       PurpleSslInputFunction func,
                       PurpleSslErrorFunction error_func,
============================================================
--- libpurple/sslconn.h	93719cf2c503556e445e9512b31e1a89ad8069de
+++ libpurple/sslconn.h	1f19333438ae15b6a678e343a57702fa9b37ffe5
@@ -211,33 +211,13 @@ PurpleSslConnection *purple_ssl_connect_
 									const char *ssl_host,
 									void *data);
 
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_SSLCONN_C_)
 /**
  * Makes a SSL connection using an already open file descriptor.
  *
- * @deprecated Use purple_ssl_connect_with_host_fd() instead.
- *
  * @param account    The account making the connection.
  * @param fd         The file descriptor.
  * @param func       The SSL input handler function.
  * @param error_func The SSL error handler function.
- * @param data       User-defined data.
- *
- * @return The SSL connection handle.
- */
-PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd,
-									   PurpleSslInputFunction func,
-									   PurpleSslErrorFunction error_func,
- 									   void *data);
-#endif
-
-/**
- * Makes a SSL connection using an already open file descriptor.
- *
- * @param account    The account making the connection.
- * @param fd         The file descriptor.
- * @param func       The SSL input handler function.
- * @param error_func The SSL error handler function.
  * @param host       The hostname of the other peer (to verify the CN)
  * @param data       User-defined data.
  *
============================================================
--- ChangeLog.API	b49d88294a539d339217c70afbed56315af979ec
+++ ChangeLog.API	02ea4f353c104a1bfb9f25f7402ec49870121667
@@ -132,6 +132,7 @@ version 3.0.0 (??/??/????):
 		* purple_proxy_connect_socks5
 		* purple_srv_cancel
 		* purple_srv_resolve_account
+		* purple_ssl_connect_fd
 		* purple_status_set_attr_boolean
 		* purple_status_set_attr_int
 		* purple_status_set_attr_string
============================================================
--- libpurple/plugins/perl/common/SSLConn.xs	d9a4f2bccbf141bd8cc3c0e7734707ec5e886d90
+++ libpurple/plugins/perl/common/SSLConn.xs	557f67d0ed45d426346f6b6ff72e8181b49f7b6e
@@ -16,13 +16,6 @@ purple_ssl_input_add(gsc, func, data)
 	Purple::Ssl::Connection gsc
 	Purple::SslInputFunction func
 
-Purple::Ssl::Connection
-purple_ssl_connect_fd(account, fd, func, error_func, data)
-	Purple::Account account
-	int fd
-	PurpleSslInputFunction func
-	PurpleSslErrorFunction error_func
-
 */
 
 MODULE = Purple::SSL  PACKAGE = Purple::SSL   PREFIX = purple_ssl_