Mercurial > pidgin.yaz
diff src/protocols/oscar/im.c @ 4662:6d8a3e81db48
[gaim-migrate @ 4973]
I removed AIM_IMFLAGS_CUSTOMCHARSET because I think it's a little
misleading, and a little silly.
3rd party client developers!!!
You must set args.charset and args.charsubset before calling
aim_im_sendch1_ext. Just set them to 0 for plain ASCII.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 07 Mar 2003 06:39:10 +0000 |
| parents | 4938d12f6d48 |
| children | 60d8c5ad77f9 |
line wrap: on
line diff
--- a/src/protocols/oscar/im.c Fri Mar 07 06:00:37 2003 +0000 +++ b/src/protocols/oscar/im.c Fri Mar 07 06:39:10 2003 +0000 @@ -343,19 +343,8 @@ aimbs_put16(&fr->data, args->msglen + 0x04); /* Character set */ - if (args->flags & AIM_IMFLAGS_CUSTOMCHARSET) { - aimbs_put16(&fr->data, args->charset); - aimbs_put16(&fr->data, args->charsubset); - } else { - if (args->flags & AIM_IMFLAGS_UNICODE) - aimbs_put16(&fr->data, 0x0002); - else if (args->flags & AIM_IMFLAGS_ISO_8859_1) - aimbs_put16(&fr->data, 0x0003); - else - aimbs_put16(&fr->data, 0x0000); - - aimbs_put16(&fr->data, 0x0000); - } + aimbs_put16(&fr->data, args->charset); + aimbs_put16(&fr->data, args->charsubset); /* Message. Not terminated */ aimbs_putraw(&fr->data, args->msg, args->msglen); @@ -428,6 +417,8 @@ args.flags = flags; args.msg = msg; args.msglen = strlen(msg); + args.charset = 0x0000; + args.charsubset = 0x0000; /* Make these don't get set by accident -- they need aim_im_sendch1_ext */ args.flags &= ~(AIM_IMFLAGS_CUSTOMFEATURES | AIM_IMFLAGS_HASICON | AIM_IMFLAGS_MULTIPART); @@ -1304,7 +1295,6 @@ /* Great. We found one. Fill it in. */ args->charset = sec->charset; args->charsubset = sec->charsubset; - args->icbmflags |= AIM_IMFLAGS_CUSTOMCHARSET; /* Set up the simple flags */ if (args->charset == 0x0000)