# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1257045539 0
# Node ID 37fee7739898ae814ae9783f4d34052cdc4f26ac
# Parent  499246239b489ed0762de7c9d2beac450da0c039# Parent  fb1f8b2ae9e1716ca3a7fb55b513d9a1d276afed
merge of '35051ef78ac9fe0b4c494411560d1b9dc566f414'
     and 'e04b036036f9bcede5b8bb241f0d8e266745de89'

diff -r 499246239b48 -r 37fee7739898 libpurple/dnsquery.c
--- a/libpurple/dnsquery.c	Sun Nov 01 03:11:15 2009 +0000
+++ b/libpurple/dnsquery.c	Sun Nov 01 03:18:59 2009 +0000
@@ -172,6 +172,7 @@
 	return FALSE;
 }
 
+#ifdef USE_IDN
 static gboolean
 dns_str_is_ascii(const char *name)
 {
@@ -183,6 +184,7 @@
 
 	return TRUE;
 }
+#endif
 
 #if defined(PURPLE_DNSQUERY_USE_FORK)
 
@@ -293,12 +295,11 @@
 			rc = purple_network_convert_idn_to_ascii(dns_params.hostname, &hostname);
 			if (rc != 0) {
 				write_to_parent(child_out, &rc, sizeof(rc));
-				close(child_out);
 				if (show_debug)
 					fprintf(stderr, "dns[%d] Error: IDN conversion returned "
 							"%d\n", getpid(), rc);
 				dns_params.hostname[0] = '\0';
-				continue;
+				break;
 			}
 		} else /* intentional to execute the g_strdup */
 #endif
@@ -323,14 +324,13 @@
 		rc = getaddrinfo(hostname, servname, &hints, &res);
 		write_to_parent(child_out, &rc, sizeof(rc));
 		if (rc != 0) {
-			close(child_out);
 			if (show_debug)
 				printf("dns[%d] Error: getaddrinfo returned %d\n",
 					getpid(), rc);
 			dns_params.hostname[0] = '\0';
 			g_free(hostname);
 			hostname = NULL;
-			continue;
+			break;
 		}
 		tmp = res;
 		while (res) {
diff -r 499246239b48 -r 37fee7739898 libpurple/dnssrv.c
--- a/libpurple/dnssrv.c	Sun Nov 01 03:11:15 2009 +0000
+++ b/libpurple/dnssrv.c	Sun Nov 01 03:18:59 2009 +0000
@@ -248,6 +248,7 @@
 	return list;
 }
 
+#ifdef USE_IDN
 static gboolean
 dns_str_is_ascii(const char *name)
 {
@@ -259,6 +260,7 @@
 
 	return TRUE;
 }
+#endif
 
 #ifndef _WIN32