Mercurial > pidgin
diff libpurple/sslconn.c @ 27573:ccb1f1777df7
merge of '01d5e162e0d796e96df727bb20f12c2e2bfdd3d0'
and 'f09b8fa2cb4486c1ddd4fbc6343caac76d3134a8'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Thu, 16 Jul 2009 05:17:45 +0000 |
parents | bff61dad9a6b |
children | d337a23e5536 |
line wrap: on
line diff
--- a/libpurple/sslconn.c Thu Jul 16 05:15:42 2009 +0000 +++ b/libpurple/sslconn.c Thu Jul 16 05:17:45 2009 +0000 @@ -100,6 +100,15 @@ PurpleSslInputFunction func, PurpleSslErrorFunction error_func, void *data) { + return purple_ssl_connect_with_ssl_cn(account, host, port, func, error_func, + NULL, data); +} + +PurpleSslConnection * +purple_ssl_connect_with_ssl_cn(PurpleAccount *account, const char *host, int port, + PurpleSslInputFunction func, PurpleSslErrorFunction error_func, + const char *ssl_cn, void *data) +{ PurpleSslConnection *gsc; g_return_val_if_fail(host != NULL, NULL); @@ -116,7 +125,7 @@ gsc = g_new0(PurpleSslConnection, 1); gsc->fd = -1; - gsc->host = g_strdup(host); + gsc->host = ssl_cn ? g_strdup(ssl_cn) : g_strdup(host); gsc->port = port; gsc->connect_cb_data = data; gsc->connect_cb = func;