changeset
merge of 'daa6296d122d2388dcfac8510652733f4fd378e4'
Tue, 18 Dec 2007 07:39:57 +0000
- author
- Mark Doliner <markdoliner@pidgin.im>
- date
- Tue, 18 Dec 2007 07:39:57 +0000
- changeset 21976
- deaca9ad18c8
- parent 21974
- daa6296d122d (current diff)
- parent 21975
- 721ddc236ce5 (diff)
- child 21977
- c87889698afb
merge of 'daa6296d122d2388dcfac8510652733f4fd378e4'
and '721ddc236ce5e8c87d2a6a6051aafcca44136967'
--- 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;
