Mercurial > pidgin.yaz
comparison libpurple/sslconn.h @ 21204:8a89c2caf9d8
propagate from branch 'im.pidgin.pidgin' (head 1e697229b1c9a564fa1e509cc9a4a83da6e664df)
to branch 'im.pidgin.pidgin.next.minor' (head 74cedc552bbe5f33b7933fdfb6fe0b7105f6c576)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Wed, 10 Oct 2007 03:57:39 +0000 |
parents | 34de8ef19294 |
children | d604027959a5 |
comparison
equal
deleted
inserted
replaced
20871:34fc2a999977 | 21204:8a89c2caf9d8 |
---|---|
183 PurpleSslConnection *purple_ssl_connect(PurpleAccount *account, const char *host, | 183 PurpleSslConnection *purple_ssl_connect(PurpleAccount *account, const char *host, |
184 int port, PurpleSslInputFunction func, | 184 int port, PurpleSslInputFunction func, |
185 PurpleSslErrorFunction error_func, | 185 PurpleSslErrorFunction error_func, |
186 void *data); | 186 void *data); |
187 | 187 |
188 #ifndef PURPLE_DISABLE_DEPRECATED | |
188 /** | 189 /** |
189 * Makes a SSL connection using an already open file descriptor. | 190 * Makes a SSL connection using an already open file descriptor. |
190 * | 191 * |
191 * @deprecated Use purple_ssl_connect_with_host_fd() instead. | 192 * @deprecated Use purple_ssl_connect_with_host_fd() instead. |
192 * | 193 * |
200 */ | 201 */ |
201 PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd, | 202 PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd, |
202 PurpleSslInputFunction func, | 203 PurpleSslInputFunction func, |
203 PurpleSslErrorFunction error_func, | 204 PurpleSslErrorFunction error_func, |
204 void *data); | 205 void *data); |
206 #endif | |
205 | 207 |
206 /** | 208 /** |
207 * Makes a SSL connection using an already open file descriptor. | 209 * Makes a SSL connection using an already open file descriptor. |
208 * | 210 * |
209 * @param account The account making the connection. | 211 * @param account The account making the connection. |