comparison libpurple/dnssrv.c @ 30578:0accc8adb18a

merge of '2f6318bd834113559a405ec68cdb178f2180b680' and '64e02b98551e11e093e4649f1516f3aceaa321e2'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 26 Sep 2010 20:16:15 +0000
parents 47ea27481972
children 08dcd2d4f0b7
comparison
equal deleted inserted replaced
30577:7b761c8601f7 30578:0accc8adb18a
532 res_main_thread_cb(gpointer data) 532 res_main_thread_cb(gpointer data)
533 { 533 {
534 PurpleSrvResponse *srvres = NULL; 534 PurpleSrvResponse *srvres = NULL;
535 PurpleSrvQueryData *query_data = data; 535 PurpleSrvQueryData *query_data = data;
536 if(query_data->error_message != NULL) { 536 if(query_data->error_message != NULL) {
537 purple_debug_error("dnssrv", query_data->error_message); 537 purple_debug_error("dnssrv", "%s", query_data->error_message);
538 if (query_data->type == DNS_TYPE_SRV) { 538 if (query_data->type == DNS_TYPE_SRV) {
539 if (query_data->cb.srv) 539 if (query_data->cb.srv)
540 query_data->cb.srv(srvres, 0, query_data->extradata); 540 query_data->cb.srv(srvres, 0, query_data->extradata);
541 } else if (query_data->type == DNS_TYPE_TXT) { 541 } else if (query_data->type == DNS_TYPE_TXT) {
542 if (query_data->cb.txt) 542 if (query_data->cb.txt)