pidgin: ad95721f: Fix a string now that we're not in strin...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Sun Sep 27 22:36:10 EDT 2009


-----------------------------------------------------------------
Revision: ad95721f47b1dcb2d2e5c50c91701526fc4fd67f
Ancestor: bd59b6d44034a232a0414586f78d8f559d9705f8
Author: darkrain42 at pidgin.im
Date: 2009-09-28T02:30:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ad95721f47b1dcb2d2e5c50c91701526fc4fd67f

Modified files:
        libpurple/dnsquery.c

ChangeLog: 

Fix a string now that we're not in string freeze.  Thanks, QuLogic!

-------------- next part --------------
============================================================
--- libpurple/dnsquery.c	be44ed4ded20b86f084e483193f56bad11f0b710
+++ libpurple/dnsquery.c	5519abf0d8ad60fd60779ac61e5976ce44c043e4
@@ -774,11 +774,8 @@ dns_thread(gpointer data)
 	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;


More information about the Commits mailing list