Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
14556:c46d204d5a30 | 14557:fb67a345056e |
---|---|
66 #define OSCAR_DEFAULT_AUTHORIZATION TRUE | 66 #define OSCAR_DEFAULT_AUTHORIZATION TRUE |
67 #define OSCAR_DEFAULT_HIDE_IP TRUE | 67 #define OSCAR_DEFAULT_HIDE_IP TRUE |
68 #define OSCAR_DEFAULT_WEB_AWARE FALSE | 68 #define OSCAR_DEFAULT_WEB_AWARE FALSE |
69 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE | 69 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE |
70 | 70 |
71 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; | 71 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; |
72 | 72 |
73 static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02}; | 73 static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02}; |
74 static guint8 features_icq[] = {0x01, 0x06}; | 74 static guint8 features_icq[] = {0x01, 0x06}; |
75 static guint8 features_icq_offline[] = {0x01}; | 75 static guint8 features_icq_offline[] = {0x01}; |
76 static guint8 ck[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; | 76 static guint8 ck[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; |
458 * as UCS-2BE. | 458 * as UCS-2BE. |
459 */ | 459 */ |
460 if ((destsn != NULL) && aim_sn_is_icq(destsn)) | 460 if ((destsn != NULL) && aim_sn_is_icq(destsn)) |
461 userinfo = aim_locate_finduserinfo(od, destsn); | 461 userinfo = aim_locate_finduserinfo(od, destsn); |
462 | 462 |
463 if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_ICQUTF8)) | 463 if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_UNICODE)) |
464 { | 464 { |
465 GaimBuddy *b; | 465 GaimBuddy *b; |
466 b = gaim_find_buddy(account, destsn); | 466 b = gaim_find_buddy(account, destsn); |
467 if ((b != NULL) && (GAIM_BUDDY_IS_ONLINE(b))) | 467 if ((b != NULL) && (GAIM_BUDDY_IS_ONLINE(b))) |
468 { | 468 { |
637 tmp = _("Nihilist"); | 637 tmp = _("Nihilist"); |
638 break; | 638 break; |
639 case OSCAR_CAPABILITY_ICQSERVERRELAY: | 639 case OSCAR_CAPABILITY_ICQSERVERRELAY: |
640 tmp = _("ICQ Server Relay"); | 640 tmp = _("ICQ Server Relay"); |
641 break; | 641 break; |
642 case OSCAR_CAPABILITY_ICQUTF8OLD: | 642 case OSCAR_CAPABILITY_UNICODEOLD: |
643 tmp = _("Old ICQ UTF8"); | 643 tmp = _("Old ICQ UTF8"); |
644 break; | 644 break; |
645 case OSCAR_CAPABILITY_TRILLIANCRYPT: | 645 case OSCAR_CAPABILITY_TRILLIANCRYPT: |
646 tmp = _("Trillian Encryption"); | 646 tmp = _("Trillian Encryption"); |
647 break; | 647 break; |
648 case OSCAR_CAPABILITY_ICQUTF8: | 648 case OSCAR_CAPABILITY_UNICODE: |
649 tmp = _("ICQ UTF8"); | 649 tmp = _("ICQ UTF8"); |
650 break; | 650 break; |
651 case OSCAR_CAPABILITY_HIPTOP: | 651 case OSCAR_CAPABILITY_HIPTOP: |
652 tmp = _("Hiptop"); | 652 tmp = _("Hiptop"); |
653 break; | 653 break; |