Mercurial > pidgin
changeset 28011:bbb9e0ea67fe
Fix not calling the SRV timeout on the win32 code. Closes #9956.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 19 Aug 2009 18:54:54 +0000 |
| parents | cc70e2bc4de5 |
| children | c06114f3d58d |
| files | ChangeLog libpurple/dnssrv.c |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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;