changeset
merge of '87adf297c982a6ca9ec004503dd695ca4f8322df'
Sat, 07 Jun 2008 20:37:46 +0000
- author
- Sadrul Habib Chowdhury <sadrul@pidgin.im>
- date
- Sat, 07 Jun 2008 20:37:46 +0000
- changeset 23460
- d44927cb29cb
- parent 23458
- 87adf297c982 (current diff)
- parent 23459
- 7223e4117d47 (diff)
- child 23461
- d4786c872b12
- child 23462
- 30de01dfe3f2
merge of '87adf297c982a6ca9ec004503dd695ca4f8322df'
and '7223e4117d473503a2f15e212df91ff266cb2aed'
--- a/libpurple/protocols/oscar/family_locate.c Sat Jun 07 20:37:18 2008 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Sat Jun 07 20:37:46 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 20:37:18 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sat Jun 07 20:37:46 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 20:37:18 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.h Sat Jun 07 20:37:46 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; /*
