Mercurial > pidgin

changeset 9639:58625ebfe03a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10487] This is completely untested. Sean is going to test it for me. committer: Tailor Script <tailor@pidgin.im>
author Ethan Blanton <elb@pidgin.im>
date Mon, 02 Aug 2004 02:16:47 +0000
parents 201c8fe4cee3
children bc2079a32fd9
files src/protocols/oscar/oscar.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c	Mon Aug 02 02:09:35 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Mon Aug 02 02:16:47 2004 +0000
@@ -375,7 +375,8 @@
 	if ((encoding == NULL) || encoding[0] == '\0') {
 		gaim_debug_info("oscar", "Empty encoding, assuming UTF-8\n");
 
-	} else if (!strcmp(encoding, "iso-8859-1")) {
+	} else if (!strcmp(encoding, "iso-8859-1")
+                   || !strcmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1")) {
 		utf8 = g_convert(text, textlen, "UTF-8", "ISO-8859-1", NULL, NULL, NULL);
 
 	} else if (!strcmp(encoding, "unicode-2-0")) {