# HG changeset patch # User Rob Flynn # Date 1034473613 0 # Node ID a9445dd25786a07d3e6934d47f6fab78af0d68dc # Parent 5b439da85c3b5540f4896409d19c8b5156e30d2f [gaim-migrate @ 3789] Hmm committer: Tailor Script diff -r 5b439da85c3b -r a9445dd25786 src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Sat Oct 12 20:45:00 2002 +0000 +++ b/src/protocols/oscar/oscar.c Sun Oct 13 01:46:53 2002 +0000 @@ -1777,7 +1777,6 @@ tmp = strdup(_("(There was an error receiving this message)")); } } else if (args->icbmflags & AIM_IMFLAGS_ISO_8859_1) { - int i; tmp = g_convert(args->msg, args->msglen, "UTF-8", "ISO-8859-1", NULL, &convlen, &err); if (err) { debug_printf("ISO-8859-1 IM conversion: %s\n", err->message); @@ -3361,8 +3360,8 @@ /* ISO-8859-1 is 0x00-0xbf in the first byte * followed by 0xc0-0xc3 in the second */ if ((unsigned char)message[i] < 0x80 || - ((unsigned char)message[i] & 0xc0 == 0x80 && - (unsigned char)message[i + 1] & 0xfc == 0xc0)) { + (((unsigned char)message[i] & 0xc0) == 0x80 && + ((unsigned char)message[i + 1] & 0xfc) == 0xc0)) { i++; continue; }