[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.244,1.245

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv14980/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
This is a silly little fix from Paco-Paco.  He makes me feel like a 
school girl again.  Boy.  School boy.  He makes me feel like a 
school boy.


...


Is this awkward for anyone else?


...


I'll be in my corner...


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- oscar.c	17 Feb 2003 15:22:21 -0000	1.244
+++ oscar.c	22 Feb 2003 02:08:45 -0000	1.245
@@ -3311,7 +3311,7 @@
 		flags = check_encoding (gc->account->user_info);
 
 		if (flags == 0) {
-			aim_bos_setprofile(sess, fr->conn, "us-ascii", gc->account->user_info, 
+			aim_bos_setprofile(sess, fr->conn, "us-ascii", gc->account->user_info,
 					   strlen(gc->account->user_info), NULL, NULL, 0, caps_aim);
 		} else {
 			unicode = g_convert (gc->account->user_info, strlen(gc->account->user_info),
@@ -5446,7 +5446,8 @@
 		return 0;
 	}
 	charset += 8;
-	if (!strcmp(charset, "\"us-ascii\"")) {
+	if (!strcmp(charset, "\"us-ascii\"") || !strcmp(charset, "\"utf-8\"")) {
+		/* UTF-8 is our native charset, ASCII is a proper subset */
 		return 0;
 	} else if (!strcmp(charset, "\"iso-8859-1\"")) {
 		return AIM_IMFLAGS_ISO_8859_1;