# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1265059713 0
# Node ID 61e2537722e0e21d3c912169ba358df5536d8ee1
# Parent  4f3a9ddfa34eaee9ad438858a79c3b7c192f4a4a# Parent  dac2aa640c4fd2a1c18055c08fee28a03f567956
merge of '6e11e232a469bd7bd1f5c8dadebcfa5809eb1cd1'
     and 'e200d014d204272dbca9f1f87a8192b0c3e85ef3'

diff -r dac2aa640c4f -r 61e2537722e0 ChangeLog
--- a/ChangeLog	Mon Feb 01 21:15:19 2010 +0000
+++ b/ChangeLog	Mon Feb 01 21:28:33 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)
diff -r dac2aa640c4f -r 61e2537722e0 libpurple/protocols/jabber/disco.c
--- a/libpurple/protocols/jabber/disco.c	Mon Feb 01 21:15:19 2010 +0000
+++ b/libpurple/protocols/jabber/disco.c	Mon Feb 01 21:28:33 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);