# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1097726340 0
# Node ID fb4216714dac94a1a900165db81d83e805cf52ea
# Parent  158950e7996d6d623329b6411d908352ee36a6bd
[gaim-migrate @ 11120]
This is better.

committer: Tailor Script <tailor@pidgin.im>

diff -r 158950e7996d -r fb4216714dac src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Thu Oct 14 03:44:42 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Oct 14 03:59:00 2004 +0000
@@ -498,11 +498,10 @@
 	const gchar *charsetstr;
 	gsize msglen;
 
-	*charset = oscar_charset_check(from);
-
 	/* Attempt to send as ASCII */
-	if (*charset == AIM_CHARSET_ASCII) {
+	if (oscar_charset_check(from) == AIM_CHARSET_ASCII) {
 		*msg = g_convert(from, strlen(from), "ASCII", "UTF-8", NULL, &msglen, NULL);
+		*charset = AIM_CHARSET_ASCII;
 		*charsubset = 0x0000;
 		*msglen_int = msglen;
 		return;