# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1103075770 0
# Node ID 7196933335d94634ea5e0d1fbc8cc1bb31a47233
# Parent  cbfd90f7fa47ca6cd1a291311e902a88507599c9
[gaim-migrate @ 11601]
Of course, though, I meant this.

committer: Tailor Script <tailor@pidgin.im>

diff -r cbfd90f7fa47 -r 7196933335d9 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Wed Dec 15 01:53:33 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Dec 15 01:56:10 2004 +0000
@@ -378,13 +378,12 @@
 	if ((encoding == NULL) || encoding[0] == '\0') {
 		gaim_debug_info("oscar", "Empty encoding, assuming UTF-8\n");
 
-	} else if (!strcmp(encoding, "iso-8859-1")
-                   || !strcmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1")) {
+	} else if (!strcmp(encoding, "iso-8859-1")) {
+		utf8 = g_convert(text, textlen, "UTF-8", "iso-8859-1", NULL, NULL, NULL);
+	} else if (!strcmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1")) {
 		utf8 = g_convert(text, textlen, "UTF-8", "Windows-1252", NULL, NULL, NULL);
-
 	} else if (!strcmp(encoding, "unicode-2-0")) {
 		utf8 = g_convert(text, textlen, "UTF-8", "UCS-2BE", NULL, NULL, NULL);
-
 	} else if (strcmp(encoding, "us-ascii") && strcmp(encoding, "utf-8")) {
 		gaim_debug_warning("oscar", "Unrecognized character encoding \"%s\", "
 						   "attempting to convert to UTF-8 anyway\n", encoding);