Mercurial > pidgin
changeset 23314:b3ec26e66e26
Specified one of the OSCAR_CAPABILITY_GENERICUNKNOWN capabilities to be
OSCAR_CAPABILITY_ICHAT_SCREENSHARE, the screen sharing facility in iChat.
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Sat, 07 Jun 2008 18:52:57 +0000 |
| parents | 9c0ee2491ed1 |
| children | d4cc956acb37 |
| files | libpurple/protocols/oscar/family_locate.c libpurple/protocols/oscar/oscar.c libpurple/protocols/oscar/oscar.h |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_locate.c Sat Jun 07 18:42:48 2008 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Sat Jun 07 18:52:57 2008 +0000 @@ -171,7 +171,7 @@ {0x09, 0x46, 0xf0, 0x03, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, - {OSCAR_CAPABILITY_GENERICUNKNOWN, + {OSCAR_CAPABILITY_ICHAT_SCREENSHARE, {0x09, 0x46, 0xf0, 0x04, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
--- a/libpurple/protocols/oscar/oscar.c Sat Jun 07 18:42:48 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sat Jun 07 18:52:57 2008 +0000 @@ -707,6 +707,9 @@ case OSCAR_CAPABILITY_CAMERA: tmp = _("Camera"); break; + case OSCAR_CAPABILITY_ICHAT_SCREENSHARE: + tmp = _("Screen Sharing"); + break; default: tmp = NULL; break;
--- a/libpurple/protocols/oscar/oscar.h Sat Jun 07 18:42:48 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.h Sat Jun 07 18:52:57 2008 +0000 @@ -353,7 +353,8 @@ OSCAR_CAPABILITY_ICHATAV = 0x02000000, OSCAR_CAPABILITY_LIVEVIDEO = 0x04000000, OSCAR_CAPABILITY_CAMERA = 0x08000000, - OSCAR_CAPABILITY_LAST = 0x10000000 + OSCAR_CAPABILITY_ICHAT_SCREENSHARE = 0x10000000, + OSCAR_CAPABILITY_LAST = 0x20000000 } OscarCapability; /*