Mercurial > pidgin.yaz
changeset 29314:4f3a9ddfa34e
jabber: Only make the SRV lookup for STUN based on the domain if no STUN
server is set in prefs.
Closes #11110
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 01 Feb 2010 21:26:35 +0000 |
| parents | 4931a24576bd |
| children | 61e2537722e0 |
| files | ChangeLog libpurple/protocols/jabber/disco.c |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 29 14:23:15 2010 +0000 +++ b/ChangeLog Mon Feb 01 21:26:35 2010 +0000 @@ -31,6 +31,8 @@ offline. * Wrap XHTML messages in <p>, as described in XEP-0071, for compatibility with some clients. + * Don't do an SRV lookup for a STUN server associated with the account + if one is already set globally in prefs. Yahoo: * Don't send <span> and </span> tags. (Fartash Faghri)
--- a/libpurple/protocols/jabber/disco.c Fri Jan 29 14:23:15 2010 +0000 +++ b/libpurple/protocols/jabber/disco.c Mon Feb 01 21:26:35 2010 +0000 @@ -22,6 +22,7 @@ */ #include "internal.h" +#include "network.h" #include "prefs.h" #include "debug.h" #include "request.h" @@ -534,8 +535,12 @@ js->googletalk = TRUE; /* autodiscover stun and relays */ - jabber_google_send_jingle_info(js); - } else { + if (purple_network_get_stun_ip() == NULL || + purple_strequal(purple_network_get_stun_ip(), "")) { + jabber_google_send_jingle_info(js); + } + } else if (purple_network_get_stun_ip() == NULL || + purple_strequal(purple_network_get_stun_ip(), "")) { js->srv_query_data = purple_srv_resolve("stun", "udp", js->user->domain, jabber_disco_stun_srv_resolve_cb, js);