comparison libpurple/protocols/jabber/jabber.c @ 27689:5f17bfa9dc70

To make grim happy (or more upset).

27688:b419196556c7

	if (use_domain || purple_ip_address_is_valid(host))
		js->serverFQDN = g_strdup(domain);
	else
		js->serverFQDN = g_strdup(host);

	if (purple_proxy_connect(js->gc, js->gc->account, host,
			port, jabber_login_callback, js->gc) == NULL) {
		if (fatal_failure) {
			purple_connection_error_reason(js->gc,
				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
				_("Unable to connect"));
		}

	js->srv_rec = NULL;

	ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
	/* Fall back to the defaults (I'm not sure if we should actually do this) */
	jabber_login_connect(js, js->user->domain, ascii_domain,
			purple_account_get_int(js->gc->account, "port", 5222),
			TRUE, TRUE);
	g_free(ascii_domain);
}

static void srv_resolved_cb(PurpleSrvResponse *resp, int results, gpointer data)

		js->max_srv_rec_idx = results;
		try_srv_connect(js);
	} else {
		char *ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
		jabber_login_connect(js, js->user->domain, ascii_domain,
				purple_account_get_int(js->gc->account, "port", 5222),
				TRUE, TRUE);
		g_free(ascii_domain);
	}
}

27689:5f17bfa9dc70

	if (use_domain || purple_ip_address_is_valid(host))
		js->serverFQDN = g_strdup(domain);
	else
		js->serverFQDN = g_strdup(host);

	if (purple_proxy_connect(js->gc, purple_connection_get_account(js->gc),
			host, port, jabber_login_callback, js->gc) == NULL) {
		if (fatal_failure) {
			purple_connection_error_reason(js->gc,
				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
				_("Unable to connect"));
		}

	js->srv_rec = NULL;

	ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
	/* Fall back to the defaults (I'm not sure if we should actually do this) */
	jabber_login_connect(js, js->user->domain, ascii_domain,
			purple_account_get_int(purple_connection_get_account(js->gc), "port", 5222),
			TRUE, TRUE);
	g_free(ascii_domain);
}

static void srv_resolved_cb(PurpleSrvResponse *resp, int results, gpointer data)

		js->max_srv_rec_idx = results;
		try_srv_connect(js);
	} else {
		char *ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
		jabber_login_connect(js, js->user->domain, ascii_domain,
				purple_account_get_int(purple_connection_get_account(js->gc), "port", 5222),
				TRUE, TRUE);
		g_free(ascii_domain);
	}
}