libpurple 32415:7f8cac34ea6b: dnssrv: Fix the purple_srv_txt_que...

[commits at adium.im]

details:	http://hg.adium.im/libpurple/rev/7f8cac34ea6b
revision:	32415:7f8cac34ea6b
branch:		adium
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Wed Oct 17 13:34:45 2012 +0200

dnssrv: Fix the purple_srv_txt_query_failed callback for TXT queries.

diffs (34 lines):

diff -r 590f15aee045 -r 7f8cac34ea6b libpurple/dnssrv.c
--- a/libpurple/dnssrv.c	Tue Oct 16 21:46:12 2012 +0200
+++ b/libpurple/dnssrv.c	Wed Oct 17 13:34:45 2012 +0200
@@ -1090,12 +1090,17 @@
 }
 
 static void
-purple_srv_query_failed(PurpleSrvTxtQueryData *query_data, const gchar *error_message)
+purple_srv_txt_query_failed(PurpleSrvTxtQueryData *query_data, const gchar *error_message)
 {
-	purple_debug_error("dnssrv", "%s\n", error_message);
+	purple_debug_error("dnssrv", "purple_srv_txt_query_failed: %s\n", error_message);
 
-	if (query_data->cb.srv != NULL)
-		query_data->cb.srv(NULL, 0, query_data->extradata);
+	if (query_data->type == T_SRV) {
+		if (query_data->cb.srv != NULL)
+			query_data->cb.srv(NULL, 0, query_data->extradata);
+	} else if (query_data->type == T_TXT) {
+		if (query_data->cb.txt != NULL)
+			query_data->cb.txt(NULL, query_data->extradata);
+	}
 
 	purple_srv_txt_query_destroy(query_data);
 }
@@ -1106,7 +1111,7 @@
 	PurpleSrvTxtQueryUiOps *ops = purple_srv_txt_query_get_ui_ops();
 
 	if (ops && ops->resolve)
-		return ops->resolve(query_data, (query_data->type == T_SRV ? purple_srv_query_resolved : purple_txt_query_resolved), purple_srv_query_failed);
+		return ops->resolve(query_data, (query_data->type == T_SRV ? purple_srv_query_resolved : purple_txt_query_resolved), purple_srv_txt_query_failed);
 
 	return FALSE;
 }