Mercurial > pidgin.yaz
diff src/protocols/jabber/jabber.c @ 12810:b0ede7907dd0
[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>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 10 Jan 2006 20:39:47 +0000 |
| parents | 5f65a0cca87c |
| children | 82e918444965 |
line wrap: on
line diff
--- 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)); } }