Mercurial > pidgin
changeset 21861:eb9f928a369d
merge of '245a620adeb2dc4767ee8db9e6c7cafa287b8f8d'
and '43f59273fcae687e1b252460cebdf2f12f2fde6f'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 18 Dec 2007 07:39:57 +0000 |
| parents | e13609ce4548 (current diff) f23c41e65f63 (diff) |
| children | ae58ffd5e929 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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;