# HG changeset patch # User Jaromr Karmazn # Date 1228983549 0 # Node ID e4b1ba7c351ceb22f4d3f7243d6e15747ce85947 # Parent 61e0924de04aca19797f410b89d10ee4ed5abb4a Advertise the same typing capability on OSCAR that ICQ 6 does, since we claim to be ICQ 6. This should fix typing notifications in some third-party clients and make us act a bit more like ICQ 6. Fixes #6300. committer: John Bailey diff -r 61e0924de04a -r e4b1ba7c351c ChangeLog --- a/ChangeLog Thu Dec 11 08:08:02 2008 +0000 +++ b/ChangeLog Thu Dec 11 08:19:09 2008 +0000 @@ -25,6 +25,8 @@ the album, if possible. * Fix use of av_len in perl bindings to fix some off-by-one bugs (Paul Aurich) + * On ICQ, advertise the ICQ 6 typing capability. This should fix the + reports of typing notifications not working with third-party clients. Gadu-Gadu: * Fix some problems with Gadu-Gadu buddy icons (Adam Strzelecki) diff -r 61e0924de04a -r e4b1ba7c351c libpurple/protocols/oscar/family_locate.c --- a/libpurple/protocols/oscar/family_locate.c Thu Dec 11 08:08:02 2008 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Thu Dec 11 08:19:09 2008 +0000 @@ -203,11 +203,9 @@ {0x2e, 0x7a, 0x64, 0x75, 0xfa, 0xdf, 0x4d, 0xc8, 0x88, 0x6f, 0xea, 0x35, 0x95, 0xfd, 0xb6, 0xdf}}, - /* - {OSCAR_CAPABILITY_ICQ2GO, + {OSCAR_CAPABILITY_TYPING, {0x56, 0x3f, 0xc8, 0x09, 0x0b, 0x6f, 0x41, 0xbd, 0x9f, 0x79, 0x42, 0x26, 0x09, 0xdf, 0xa2, 0xf3}}, - */ /* * Chat is oddball. diff -r 61e0924de04a -r e4b1ba7c351c libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Thu Dec 11 08:08:02 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Dec 11 08:19:09 2008 +0000 @@ -68,7 +68,7 @@ static OscarCapability purple_caps = (OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_UNICODE | OSCAR_CAPABILITY_INTEROPERATE | - OSCAR_CAPABILITY_SHORTCAPS); + OSCAR_CAPABILITY_SHORTCAPS | OSCAR_CAPABILITY_TYPING); static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02}; static guint8 features_icq[] = {0x01, 0x06}; diff -r 61e0924de04a -r e4b1ba7c351c libpurple/protocols/oscar/oscar.h --- a/libpurple/protocols/oscar/oscar.h Thu Dec 11 08:08:02 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.h Thu Dec 11 08:19:09 2008 +0000 @@ -362,8 +362,9 @@ OSCAR_CAPABILITY_LIVEVIDEO = 0x02000000, OSCAR_CAPABILITY_CAMERA = 0x04000000, OSCAR_CAPABILITY_ICHAT_SCREENSHARE = 0x08000000, - OSCAR_CAPABILITY_GENERICUNKNOWN = 0x10000000, - OSCAR_CAPABILITY_LAST = 0x20000000 + OSCAR_CAPABILITY_TYPING = 0x10000000, + OSCAR_CAPABILITY_GENERICUNKNOWN = 0x20000000, + OSCAR_CAPABILITY_LAST = 0x40000000 } OscarCapability; /*