# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1136925587 0
# Node ID b0ede7907dd06cd78c8107ff09a6566d5509e3aa
# Parent  d43f374b352b1ba22d97b4e51a13ba5eb7d78da4
[gaim-migrate @ 15158]
Improve the handling of SRV results.  If we get a result, use the specified port; if you want to manually specify the port, you need to manually specify the connect server and not do the SRV lookup at all. This was discussed in #gaim last night.

committer: Tailor Script <tailor@pidgin.im>

diff -r d43f374b352b -r b0ede7907dd0 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Tue Jan 10 08:07:45 2006 +0000
+++ b/src/protocols/jabber/jabber.c	Tue Jan 10 20:39:47 2006 +0000
@@ -410,13 +410,13 @@
 static void srv_resolved_cb(GaimSrvResponse *resp, int results, gpointer data)
 {
 	JabberStream *js = (JabberStream*)data;
-	int config_port = gaim_account_get_int(js->gc->account, "port", 0);
 
 	if(results) {
-		jabber_login_connect(js, resp->hostname, config_port ? config_port : resp->port);
+		jabber_login_connect(js, resp->hostname, resp->port);
 		g_free(resp);
 	} else {
-		jabber_login_connect(js, js->user->domain, config_port);
+		jabber_login_connect(js, js->user->domain,
+			gaim_account_get_int(js->gc->account, "port", 0));
 	}
 }