Mercurial > pidgin
changeset 23630:46cc31494ff4
Undid the addition of 2 OscarCapability items I added previously, keeping the commented-out notes in family_locate. We can't let the OscarCapability bitmask get as large as 0x04000000, because if it exceeds the platforms MAX_UINT we'll end up in an infinite loop in oscar_caps_to_string() due to overflow.
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Fri, 01 Aug 2008 07:04:25 +0000 |
| parents | ad68d734205a |
| children | b33b5e56a482 |
| files | libpurple/protocols/oscar/family_locate.c libpurple/protocols/oscar/oscar.h |
| diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_locate.c Fri Aug 01 05:16:39 2008 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Fri Aug 01 07:04:25 2008 +0000 @@ -63,7 +63,8 @@ {0x09, 0x46, 0x00, 0x01, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, - {OSCAR_CAPABILITY_XHTML_IM, + /* OSCAR_CAPABILITY_XHTML_IM */ + {OSCAR_CAPABILITY_GENERICUNKNOWN, {0x09, 0x46, 0x00, 0x02, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, @@ -82,7 +83,8 @@ 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, /* "Microphone" support in Windows AIM 5.5.3501 and newer */ - {OSCAR_CAPABILITY_MICROPHONE, + /* OSCAR_CAPABILITY_MICROPHONE */ + {OSCAR_CAPABILITY_GENERICUNKNOWN, {0x09, 0x46, 0x01, 0x03, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
--- a/libpurple/protocols/oscar/oscar.h Fri Aug 01 05:16:39 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.h Fri Aug 01 07:04:25 2008 +0000 @@ -357,15 +357,13 @@ OSCAR_CAPABILITY_HIPTOP = 0x00100000, OSCAR_CAPABILITY_SECUREIM = 0x00200000, OSCAR_CAPABILITY_SMS = 0x00400000, - OSCAR_CAPABILITY_MICROPHONE = 0x00800000, - OSCAR_CAPABILITY_VIDEO = 0x01000000, - OSCAR_CAPABILITY_ICHATAV = 0x02000000, - OSCAR_CAPABILITY_LIVEVIDEO = 0x04000000, - OSCAR_CAPABILITY_CAMERA = 0x08000000, - OSCAR_CAPABILITY_ICHAT_SCREENSHARE = 0x10000000, - OSCAR_CAPABILITY_XHTML_IM = 0x20000000, - OSCAR_CAPABILITY_GENERICUNKNOWN = 0x40000000, - OSCAR_CAPABILITY_LAST = 0x80000000 + OSCAR_CAPABILITY_VIDEO = 0x00800000, + OSCAR_CAPABILITY_ICHATAV = 0x01000000, + OSCAR_CAPABILITY_LIVEVIDEO = 0x02000000, + OSCAR_CAPABILITY_CAMERA = 0x04000000, + OSCAR_CAPABILITY_ICHAT_SCREENSHARE = 0x08000000, + OSCAR_CAPABILITY_GENERICUNKNOWN = 0x10000000, + OSCAR_CAPABILITY_LAST = 0x20000000 } OscarCapability; /*