comparison libpurple/protocols/jabber/jabber.c @ 18929:67cb28c0ec89

applied changes from e52b685d84ca8874da6e3e71199829e513500642 through 504a3dc38ec168dab1f4443c13d14858db47cd70 - Pulling the ssl_connect_with_host_fd change from soc.2007.xmpp

18928:299022c9b32d

static void tls_init(JabberStream *js)
{
	purple_input_remove(js->gc->inpa);
	js->gc->inpa = 0;
	js->gsc = purple_ssl_connect_fd(js->gc->account, js->fd,
			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc);
}

static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port)
{
#ifdef HAVE_CYRUS_SASL
	js->serverFQDN = g_strdup(fqdn);
#endif

	if (purple_proxy_connect(js->gc, js->gc->account, host,
			port, jabber_login_callback, js->gc) == NULL)
		purple_connection_error(js->gc, _("Unable to create socket"));
}

		sasl_dispose(&js->sasl);
	if(js->sasl_mechs)
		g_string_free(js->sasl_mechs, TRUE);
	if(js->sasl_cb)
		g_free(js->sasl_cb);
	if(js->serverFQDN)
		g_free(js->serverFQDN);
#endif
	g_free(js->server_name);
	g_free(js->gmail_last_time);
	g_free(js->gmail_last_tid);
	g_free(js);

18929:67cb28c0ec89

static void tls_init(JabberStream *js)
{
	purple_input_remove(js->gc->inpa);
	js->gc->inpa = 0;
	js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->serverFQDN, js->gc);
}

static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port)
{
	js->serverFQDN = g_strdup(fqdn);

	if (purple_proxy_connect(js->gc, js->gc->account, host,
			port, jabber_login_callback, js->gc) == NULL)
		purple_connection_error(js->gc, _("Unable to create socket"));
}

		sasl_dispose(&js->sasl);
	if(js->sasl_mechs)
		g_string_free(js->sasl_mechs, TRUE);
	if(js->sasl_cb)
		g_free(js->sasl_cb);
#endif
	if(js->serverFQDN)
		g_free(js->serverFQDN);
	g_free(js->server_name);
	g_free(js->gmail_last_time);
	g_free(js->gmail_last_tid);
	g_free(js);