Mercurial > pidgin.yaz
diff libgaim/protocols/oscar/oscar.c @ 14557:fb67a345056e
[gaim-migrate @ 17280]
Fix a misnamed define. UTF8 is wrong. The actual encoding
used is UCS-2BE. No functionality change.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 14 Sep 2006 22:21:52 +0000 |
| parents | 7ca5e82ffd6f |
| children | 3a65f07aaf54 |
line wrap: on
line diff
--- a/libgaim/protocols/oscar/oscar.c Thu Sep 14 21:53:30 2006 +0000 +++ b/libgaim/protocols/oscar/oscar.c Thu Sep 14 22:21:52 2006 +0000 @@ -68,7 +68,7 @@ #define OSCAR_DEFAULT_WEB_AWARE FALSE #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE -static OscarCapability gaim_caps = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_ICQUTF8 | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT; +static OscarCapability gaim_caps = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_UNICODE | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT; static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02}; static guint8 features_icq[] = {0x01, 0x06}; @@ -460,7 +460,7 @@ if ((destsn != NULL) && aim_sn_is_icq(destsn)) userinfo = aim_locate_finduserinfo(od, destsn); - if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_ICQUTF8)) + if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_UNICODE)) { GaimBuddy *b; b = gaim_find_buddy(account, destsn); @@ -639,13 +639,13 @@ case OSCAR_CAPABILITY_ICQSERVERRELAY: tmp = _("ICQ Server Relay"); break; - case OSCAR_CAPABILITY_ICQUTF8OLD: + case OSCAR_CAPABILITY_UNICODEOLD: tmp = _("Old ICQ UTF8"); break; case OSCAR_CAPABILITY_TRILLIANCRYPT: tmp = _("Trillian Encryption"); break; - case OSCAR_CAPABILITY_ICQUTF8: + case OSCAR_CAPABILITY_UNICODE: tmp = _("ICQ UTF8"); break; case OSCAR_CAPABILITY_HIPTOP: