# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250708094 0
# Node ID bbb9e0ea67fea0f139db2bc8e0cbdb6e9bae5495
# Parent  cc70e2bc4de52468491fb83a043aa835b9fafd60
Fix not calling the SRV timeout on the win32 code. Closes #9956.

diff -r cc70e2bc4de5 -r bbb9e0ea67fe ChangeLog
--- a/ChangeLog	Wed Aug 19 16:21:47 2009 +0000
+++ b/ChangeLog	Wed Aug 19 18:54:54 2009 +0000
@@ -4,6 +4,8 @@
 	XMPP:
 	* Prompt the user before cancelling a presence subscription.
 	* Escape status messages that have HTML entities in the Get Info dialog.
+	* Fix connecting to XMPP domains with no SRV records from Pidgin on
+	  Windows.
 
 version 2.6.1 (08/18/2009):
 	* Fix a crash when some users send you a link in a Yahoo IM
diff -r cc70e2bc4de5 -r bbb9e0ea67fe libpurple/dnssrv.c
--- a/libpurple/dnssrv.c	Wed Aug 19 16:21:47 2009 +0000
+++ b/libpurple/dnssrv.c	Wed Aug 19 18:54:54 2009 +0000
@@ -465,9 +465,16 @@
 {
 	PurpleSrvResponse *srvres = NULL;
 	PurpleSrvQueryData *query_data = data;
-	if(query_data->error_message != NULL)
+	if(query_data->error_message != NULL) {
 		purple_debug_error("dnssrv", query_data->error_message);
-	else {
+		if (query_data->type == DNS_TYPE_SRV) {
+			if (query_data->cb.srv)
+				query_data->cb.srv(srvres, 0, query_data->extradata);
+		} else if (query_data->type == DNS_TYPE_TXT) {
+			if (query_data->cb.txt)
+				query_data->cb.txt(NULL, query_data->extradata);
+		}
+	} else {
 		if (query_data->type == DNS_TYPE_SRV) {
 			PurpleSrvResponse *srvres_tmp = NULL;
 			GList *lst = query_data->results;