# HG changeset patch # User Andreas Monitzer # Date 1181061080 0 # Node ID f41a561e3b7bf1c2cae089331f209459e73689a4 # Parent 2e93ee8d3083e87ab3775acd8e6d375ffe013b26 New API name change, per request of Sean. diff -r 2e93ee8d3083 -r f41a561e3b7b libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c Tue Jun 05 15:33:36 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue Jun 05 16:31:20 2007 +0000 @@ -504,7 +504,7 @@ { purple_input_remove(js->gc->inpa); js->gc->inpa = 0; - js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd, + js->gsc = purple_ssl_connect_fd_with_host(js->gc->account, js->fd, jabber_login_callback_ssl, jabber_ssl_connect_failure, js->serverFQDN, js->gc); } diff -r 2e93ee8d3083 -r f41a561e3b7b libpurple/sslconn.c --- a/libpurple/sslconn.c Tue Jun 05 15:33:36 2007 +0000 +++ b/libpurple/sslconn.c Tue Jun 05 16:31:20 2007 +0000 @@ -157,11 +157,11 @@ PurpleSslErrorFunction error_func, void *data) { - return purple_ssl_connect_with_host_fd(account, fd, func, error_func, NULL, data); + return purple_ssl_connect_fd_with_host(account, fd, func, error_func, NULL, data); } PurpleSslConnection * -purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, +purple_ssl_connect_fd_with_host(PurpleAccount *account, int fd, PurpleSslInputFunction func, PurpleSslErrorFunction error_func, const char *host, diff -r 2e93ee8d3083 -r f41a561e3b7b libpurple/sslconn.h --- a/libpurple/sslconn.h Tue Jun 05 15:33:36 2007 +0000 +++ b/libpurple/sslconn.h Tue Jun 05 16:31:20 2007 +0000 @@ -154,7 +154,7 @@ /** * Makes a SSL connection using an already open file descriptor. - * DEPRECATED. Use purple_ssl_connect_with_host_fd instead. + * @deprecated Use purple_ssl_connect_fd_with_host instead. * * @param account The account making the connection. * @param fd The file descriptor. @@ -181,7 +181,7 @@ * * @return The SSL connection handle. */ -PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, +PurpleSslConnection *purple_ssl_connect_fd_with_host(PurpleAccount *account, int fd, PurpleSslInputFunction func, PurpleSslErrorFunction error_func, const char *host,