pidgin: 1fa60074: Fix not calling the SRV timeout on the w...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 1fa60074b939d7c3827e843242f1532560f6f4a6
Ancestor: eed5cde2fba3fd49d2f5f4e1df8d25312fc34f61
Author: darkrain42 at pidgin.im
Date: 2009-08-19T18:54:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1fa60074b939d7c3827e843242f1532560f6f4a6

Modified files:
        ChangeLog libpurple/dnssrv.c

ChangeLog: 

Fix not calling the SRV timeout on the win32 code. Closes #9956.

-------------- next part --------------
============================================================
--- ChangeLog	3e8e4f8ec5673df559be965a11c1df0eff2e520e
+++ ChangeLog	cde4f5ed6ca7887db3afc48c7d7c3c91d6019d9c
@@ -4,6 +4,8 @@ version 2.6.2 (??/??/2009):
 	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
============================================================
--- libpurple/dnssrv.c	d273768620eac040e9406a8fd3290b8ca0db6fc6
+++ libpurple/dnssrv.c	79c499e88003feb8282776bee5347cd1589f6aa5
@@ -465,10 +465,17 @@ res_main_thread_cb(gpointer data)
 {
 	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;
 			int size = g_list_length(lst);