# HG changeset patch
# User andrew.victor@mxit.com
# Date 1316123824 0
# Node ID d337a23e5536b5b0e1f16156078aba14374a8591
# Parent  4d64ab35c73ba0b47782f57a274d00857c4b9243
Remove deprecated purple_ssl_connect_fd().

diff -r 4d64ab35c73b -r d337a23e5536 ChangeLog.API
--- a/ChangeLog.API	Thu Sep 15 21:52:28 2011 +0000
+++ b/ChangeLog.API	Thu Sep 15 21:57:04 2011 +0000
@@ -132,6 +132,7 @@
 		* 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
diff -r 4d64ab35c73b -r d337a23e5536 libpurple/plugins/perl/common/SSLConn.xs
--- a/libpurple/plugins/perl/common/SSLConn.xs	Thu Sep 15 21:52:28 2011 +0000
+++ b/libpurple/plugins/perl/common/SSLConn.xs	Thu Sep 15 21:57:04 2011 +0000
@@ -16,13 +16,6 @@
 	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_
diff -r 4d64ab35c73b -r d337a23e5536 libpurple/sslconn.c
--- a/libpurple/sslconn.c	Thu Sep 15 21:52:28 2011 +0000
+++ b/libpurple/sslconn.c	Thu Sep 15 21:57:04 2011 +0000
@@ -185,15 +185,6 @@
 }
 
 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,
diff -r 4d64ab35c73b -r d337a23e5536 libpurple/sslconn.h
--- a/libpurple/sslconn.h	Thu Sep 15 21:52:28 2011 +0000
+++ b/libpurple/sslconn.h	Thu Sep 15 21:57:04 2011 +0000
@@ -211,26 +211,6 @@
 									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.
  *