# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1192815741 0
# Node ID 6a128c9bd1705b9934e5cf70ccdcd95e4cd92b8e
# Parent  615f6343035f2814c94224a8ff37c71581fdba47
applied changes from 77376fe079e753b612b3b8c901060e689f3dee11
             through 077670cb60ab530215573771befe704110370be0

diff -r 615f6343035f -r 6a128c9bd170 libpurple/dnsquery.c
--- a/libpurple/dnsquery.c	Fri Oct 19 17:41:48 2007 +0000
+++ b/libpurple/dnsquery.c	Fri Oct 19 17:42:21 2007 +0000
@@ -637,9 +637,10 @@
 static gboolean
 dns_main_thread_cb(gpointer data)
 {
-	PurpleDnsQueryData *query_data;
+	PurpleDnsQueryData *query_data = data;
 
-	query_data = data;
+	/* We're done, so purple_dnsquery_destroy() shouldn't think it is canceling an in-progress lookup */
+	query_data->resolver = NULL;
 
 	if (query_data->error_message != NULL)
 		purple_dnsquery_failed(query_data, query_data->error_message);
@@ -713,7 +714,7 @@
 #endif
 
 	/* back to main thread */
-	g_idle_add(dns_main_thread_cb, query_data);
+	purple_timeout_add(0, dns_main_thread_cb, query_data);
 
 	return 0;
 }
@@ -780,14 +781,12 @@
 
 	purple_debug_info("dnsquery", "Performing DNS lookup for %s\n", hostname);
 
-	query_data = g_new(PurpleDnsQueryData, 1);
+	query_data = g_new0(PurpleDnsQueryData, 1);
 	query_data->hostname = g_strdup(hostname);
 	g_strstrip(query_data->hostname);
 	query_data->port = port;
 	query_data->callback = callback;
 	query_data->data = data;
-	query_data->error_message = NULL;
-	query_data->hosts = NULL;
 
 	if (strlen(query_data->hostname) == 0)
 	{