pidgin: 6e11e232: jabber: Only make the SRV lookup for STU...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 6e11e232a469bd7bd1f5c8dadebcfa5809eb1cd1
Ancestor: 47bd1e8215f2e068f00151ed40c211745f596aba
Author: malu at pidgin.im
Date: 2010-02-01T21:26:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6e11e232a469bd7bd1f5c8dadebcfa5809eb1cd1

Modified files:
        ChangeLog libpurple/protocols/jabber/disco.c

ChangeLog: 

jabber: Only make the SRV lookup for STUN based on the domain if no STUN
server is set in prefs.
Closes #11110 

-------------- next part --------------
============================================================
--- ChangeLog	cf7f200345fcad535213d102b40f2c344c52f948
+++ ChangeLog	966499d7cc6fa4f34b31b1af65254bb44e97d853
@@ -31,6 +31,8 @@ version 2.6.6 (??/??/20??):
 	  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)
============================================================
--- libpurple/protocols/jabber/disco.c	a6bd8650006e651c876566a6f9a6d7aed4a4bc3f
+++ libpurple/protocols/jabber/disco.c	cafcb26b37cba8a9fe428d442e5aaca199b4dbb6
@@ -22,6 +22,7 @@
  */
 
 #include "internal.h"
+#include "network.h"
 #include "prefs.h"
 #include "debug.h"
 #include "request.h"
@@ -534,8 +535,12 @@ jabber_disco_server_info_result_cb(Jabbe
 			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);