Mercurial > pidgin
changeset 26914:338ac8c43931
merge of '062468e9e5c7b0a7d4fb51cbd78c9a769cbd120a'
and '13f518fad2e8dacf137c733223da9b6d535c8ae1'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 19 May 2009 06:35:24 +0000 |
| parents | 56460ebd1558 (current diff) 99e3f40d082f (diff) |
| children | 90e7220cf773 |
| files | libpurple/protocols/yahoo/yahoo_auth.c libpurple/protocols/yahoo/yahoo_auth.h libpurple/protocols/yahoo/yahoo_crypt.c libpurple/protocols/yahoo/yahoo_crypt.h |
| diffstat | 3 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_locate.c Tue May 19 05:56:50 2009 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Tue May 19 06:35:24 2009 +0000 @@ -68,8 +68,12 @@ {0x09, 0x46, 0x00, 0x02, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, + {OSCAR_CAPABILITY_VIDEO, + {0x09, 0x46, 0x01, 0x00, 0x4c, 0x7f, 0x11, 0xd1, + 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, + /* "Live Video" (SIP/RTC Video) support in Windows AIM 5.5.3501 and newer */ - {OSCAR_CAPABILITY_VIDEO, + {OSCAR_CAPABILITY_LIVEVIDEO, {0x09, 0x46, 0x01, 0x01, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
--- a/libpurple/protocols/oscar/oscar.c Tue May 19 05:56:50 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue May 19 06:35:24 2009 +0000 @@ -714,6 +714,9 @@ case OSCAR_CAPABILITY_ICHATAV: tmp = _("iChat AV"); break; + case OSCAR_CAPABILITY_LIVEVIDEO: + tmp = _("Live Video"); + break; case OSCAR_CAPABILITY_CAMERA: tmp = _("Camera"); break;
--- a/libpurple/protocols/oscar/oscar.h Tue May 19 05:56:50 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.h Tue May 19 06:35:24 2009 +0000 @@ -369,11 +369,12 @@ OSCAR_CAPABILITY_SMS = 0x00400000, OSCAR_CAPABILITY_VIDEO = 0x00800000, OSCAR_CAPABILITY_ICHATAV = 0x01000000, - OSCAR_CAPABILITY_CAMERA = 0x02000000, - OSCAR_CAPABILITY_ICHAT_SCREENSHARE = 0x04000000, - OSCAR_CAPABILITY_TYPING = 0x08000000, - OSCAR_CAPABILITY_GENERICUNKNOWN = 0x10000000, - OSCAR_CAPABILITY_LAST = 0x20000000 + OSCAR_CAPABILITY_LIVEVIDEO = 0x02000000, + OSCAR_CAPABILITY_CAMERA = 0x04000000, + OSCAR_CAPABILITY_ICHAT_SCREENSHARE = 0x08000000, + OSCAR_CAPABILITY_TYPING = 0x10000000, + OSCAR_CAPABILITY_GENERICUNKNOWN = 0x20000000, + OSCAR_CAPABILITY_LAST = 0x40000000 } OscarCapability; /*