# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1197963597 0
# Node ID eb9f928a369dd5eb2390197b74563ee4a92ee5e0
# Parent  e13609ce45488ab730ed2470307000771a609ae5# Parent  f23c41e65f6318ec8aa0f7b026799d93ac5efdc1
merge of '245a620adeb2dc4767ee8db9e6c7cafa287b8f8d'
     and '43f59273fcae687e1b252460cebdf2f12f2fde6f'

diff -r e13609ce4548 -r eb9f928a369d pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Tue Dec 18 07:33:32 2007 +0000
+++ b/pidgin/gtkutils.c	Tue Dec 18 07:39:57 2007 +0000
@@ -1399,7 +1399,7 @@
 			char *str;
 
 			str = g_strdup_printf(_("The following error has occurred loading %s: %s"),
-						data->filename, strerror(errno));
+						data->filename, g_strerror(errno));
 			purple_notify_error(NULL, NULL,
 					  _("Failed to load image"),
 					  str);
diff -r e13609ce4548 -r eb9f928a369d pidgin/plugins/crazychat/cc_network.c
--- a/pidgin/plugins/crazychat/cc_network.c	Tue Dec 18 07:33:32 2007 +0000
+++ b/pidgin/plugins/crazychat/cc_network.c	Tue Dec 18 07:39:57 2007 +0000
@@ -529,7 +529,7 @@
 	while (total < len) {
 		n = send(s, buf + total, bytesleft, 0);
 		if (n == -1) {
-			Debug("ERROR: %s\n", strerror(errno));
+			Debug("ERROR: %s\n", g_strerror(errno));
 			return -1;
 		}
 		total += n;