# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1254120286 0
# Node ID 213a3449bb3ce5889d87a4599afa657e4e899a25
# Parent  160b864e3d9bcd061219c9de50186872033905c3# Parent  4c58aa4aacb02d5148a5e5230eee4b0f1ee08122
merge of 'ad95721f47b1dcb2d2e5c50c91701526fc4fd67f'
     and 'd3c619bb9b8fa811713cff87318d618e1c82de83'

diff -r 4c58aa4aacb0 -r 213a3449bb3c libpurple/dnsquery.c
--- a/libpurple/dnsquery.c	Mon Sep 28 01:54:43 2009 +0000
+++ b/libpurple/dnsquery.c	Mon Sep 28 06:44:46 2009 +0000
@@ -776,11 +776,8 @@
 	if (!dns_str_is_ascii(query_data->hostname)) {
 		rc = purple_network_convert_idn_to_ascii(query_data->hostname, &hostname);
 		if (rc != 0) {
-			/* FIXME: Dirty 2.6.0 string freeze hack */
-			char tmp[8];
-			g_snprintf(tmp, sizeof(tmp), "%d", rc);
-			query_data->error_message = g_strdup_printf(_("Error resolving %s:\n%s"),
-					query_data->hostname, tmp);
+			query_data->error_message = g_strdup_printf(_("Error converting %s "
+					"to punycode: %d"), query_data->hostname, rc);
 			/* back to main thread */
 			purple_timeout_add(0, dns_main_thread_cb, query_data);
 			return 0;