pidgin: 577b79b4: ASCII-ize the TXT query, too.
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Sat Jul 18 03:50:27 EDT 2009
-----------------------------------------------------------------
Revision: 577b79b4a6c0c8ac923f3260c3bc73a78c530688
Ancestor: 566ce451dc4c5c20f90b1d1f53b83a85aae04c34
Author: darkrain42 at pidgin.im
Date: 2009-07-18T07:49:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/577b79b4a6c0c8ac923f3260c3bc73a78c530688
Modified files:
libpurple/protocols/jabber/jabber.c
ChangeLog:
ASCII-ize the TXT query, too.
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c b85761368ed484c4d29a689fff6f3146c82d8e99
+++ libpurple/protocols/jabber/jabber.c 392595bba12972e25fc0c4508148b3290355506a
@@ -657,8 +657,11 @@ jabber_login_callback(gpointer data, gin
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 @@ jabber_stream_connect(JabberStream *js)
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"));
More information about the Commits
mailing list