comparison libpurple/sslconn.c @ 32819:2c6510167895 default tip

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24) to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 02 Jun 2012 02:30:49 +0000
parents d337a23e5536
children
comparison
equal deleted inserted replaced
32818:01ff09d4a463 32819:2c6510167895
183 return _("Unknown SSL error"); 183 return _("Unknown SSL error");
184 } 184 }
185 } 185 }
186 186
187 PurpleSslConnection * 187 PurpleSslConnection *
188 purple_ssl_connect_fd(PurpleAccount *account, int fd,
189 PurpleSslInputFunction func,
190 PurpleSslErrorFunction error_func,
191 void *data)
192 {
193 return purple_ssl_connect_with_host_fd(account, fd, func, error_func, NULL, data);
194 }
195
196 PurpleSslConnection *
197 purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, 188 purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd,
198 PurpleSslInputFunction func, 189 PurpleSslInputFunction func,
199 PurpleSslErrorFunction error_func, 190 PurpleSslErrorFunction error_func,
200 const char *host, 191 const char *host,
201 void *data) 192 void *data)