changeset 27608:6f455daf3776

ASCII-ize the TXT query, too.
author Paul Aurich <paul@darkrain42.org>
date Sat, 18 Jul 2009 07:49:17 +0000
parents f95bcb5eb047
children 8b6bf8479d10
files libpurple/protocols/jabber/jabber.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Sat Jul 18 07:23:09 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Jul 18 07:49:17 2009 +0000
@@ -657,8 +657,11 @@
 			purple_debug_error("jabber", "Unable to connect to server: %s.  Trying next SRV record.\n", error);
 			try_srv_connect(js);
 		} else {
+			char *ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
 			purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain);
-			js->srv_query_data = purple_txt_resolve("_xmppconnect", js->user->domain, txt_resolved_cb, js);
+			js->srv_query_data = purple_txt_resolve("_xmppconnect",
+					ascii_domain, txt_resolved_cb, js);
+			g_free(ascii_domain);
 		}
 		return;
 	}
@@ -882,7 +885,6 @@
 
 	ascii_domain = jabber_try_idna_to_ascii(js->certificate_CN);
 	if (ascii_domain == NULL) {
-		/* TODO: Change this for 2.6.1 */
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
 				_("Invalid XMPP ID"));