pidgin: 9a15955b: Advertise the same typing capability on ...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 9a15955bb377eff51316851e03db1cd7a5f9ba7f
Ancestor: d92e50656580c151c2dfbc58cc25da3be3b390b4
Author: blue.beret at seznam.cz
Date: 2008-12-11T08:19:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9a15955bb377eff51316851e03db1cd7a5f9ba7f

Modified files:
        ChangeLog libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- ChangeLog	cd26b03b11abdb2a6cd4261320c945cf29859286
+++ ChangeLog	20189d961d6a3b7992e49df93794208911f1846f
@@ -25,6 +25,8 @@ version 2.5.3 (??/??/????):
 	  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)
============================================================
--- libpurple/protocols/oscar/family_locate.c	d3e1dde388003a3e3fa9bed022440c1a95a2e9e7
+++ libpurple/protocols/oscar/family_locate.c	0bb13fa8146a056def8219a666626128d41c64ce
@@ -203,11 +203,9 @@ static const struct {
 	 {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.
============================================================
--- libpurple/protocols/oscar/oscar.c	6454ece0e31365bec6d3967499b30a822161e7c2
+++ libpurple/protocols/oscar/oscar.c	cf14e14bd889bd2e7fbdce94b640a863c612be7e
@@ -68,7 +68,7 @@ static OscarCapability purple_caps = (OS
 
 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};
============================================================
--- libpurple/protocols/oscar/oscar.h	de5f3e4d647f8d1aa4ce2ad067901849dce40970
+++ libpurple/protocols/oscar/oscar.h	2cc7dd9e83b07bca32bcafa13af7da780312159b
@@ -362,8 +362,9 @@ typedef enum
 	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;
 
 /*