Mercurial > pidgin.yaz
diff libpurple/protocols/sametime/sametime.c @ 21121:35b4f1dc4c8d
replace most calls to strerror with calls to g_strerror. strerror will return
a locale-specific string in the locale-specific encoding, which isn't
guaranteed to be UTF-8. g_strerror will always return a UTF-8 string.
I left gg and zephyr untouched, since gg doesn't include glib headers yet,
and zephyr does something weird with a #define for strerror. Someone more
familliar with those should take a look.
And the win32 guys should check and see if I screwed something up, since
they had strerror #defined to something else.
This should fix #2247 (and maybe some mystery crashes)
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Sat, 03 Nov 2007 17:52:28 +0000 |
parents | 3cc856ca2338 |
children | 6de09629f091 |
line wrap: on
line diff
--- a/libpurple/protocols/sametime/sametime.c Sat Nov 03 17:04:25 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Sat Nov 03 17:52:28 2007 +0000 @@ -1702,7 +1702,7 @@ purple_connection_error(pd->gc, _("Connection reset")); } else if(ret < 0) { - char *msg = strerror(err); + char *msg = g_strerror(err); DEBUG_INFO("error in read callback: %s\n", msg); @@ -2167,7 +2167,7 @@ } else { int err = errno; DEBUG_WARN("problem reading from file %s: %s\n", - NSTR(mwFileTransfer_getFileName(ft)), strerror(err)); + NSTR(mwFileTransfer_getFileName(ft)), g_strerror(err)); mwFileTransfer_cancel(ft); } @@ -5009,7 +5009,7 @@ fp = g_fopen(filename, "rb"); if(! fp) { char *msg = g_strdup_printf(_("Error reading file %s: \n%s\n"), - filename, strerror(errno)); + filename, g_strerror(errno)); purple_xfer_error(purple_xfer_get_type(xfer), acct, xfer->who, msg); g_free(msg); return;