pidgin: 0d858a89: Undid the addition of 2 OscarCapability ...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 0d858a8978355a1e8b7305b64b87db51e44e9978
Ancestor: 92c5ed9599014f7db56b92520c91540fd2453431
Author: evands at pidgin.im
Date: 2008-08-01T07:04:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0d858a8978355a1e8b7305b64b87db51e44e9978

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

ChangeLog: 

Undid the addition of 2 OscarCapability items I added previously, keeping the commented-out notes in family_locate. We can't let the OscarCapability bitmask get as large as 0x04000000, because if it exceeds the platforms MAX_UINT we'll end up in an infinite loop in oscar_caps_to_string() due to overflow.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_locate.c	e868c651aeff04040f7518fd414a1d5f1003e822
+++ libpurple/protocols/oscar/family_locate.c	d3e1dde388003a3e3fa9bed022440c1a95a2e9e7
@@ -63,7 +63,8 @@ static const struct {
 	 {0x09, 0x46, 0x00, 0x01, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	{OSCAR_CAPABILITY_XHTML_IM,
+	/* OSCAR_CAPABILITY_XHTML_IM */
+	{OSCAR_CAPABILITY_GENERICUNKNOWN,
 	 {0x09, 0x46, 0x00, 0x02, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
@@ -82,7 +83,8 @@ static const struct {
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
 	/* "Microphone" support in Windows AIM 5.5.3501 and newer */
-	{OSCAR_CAPABILITY_MICROPHONE,
+	/* OSCAR_CAPABILITY_MICROPHONE */
+	{OSCAR_CAPABILITY_GENERICUNKNOWN,
 	 {0x09, 0x46, 0x01, 0x03, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
============================================================
--- libpurple/protocols/oscar/oscar.h	fe9371523cf3c655e03f577b1d33ab6d51219c36
+++ libpurple/protocols/oscar/oscar.h	4ed9897d5647f92b3ebe5422ab6048a58524a26d
@@ -357,15 +357,13 @@ typedef enum
 	OSCAR_CAPABILITY_HIPTOP               = 0x00100000,
 	OSCAR_CAPABILITY_SECUREIM             = 0x00200000,
 	OSCAR_CAPABILITY_SMS                  = 0x00400000,
-	OSCAR_CAPABILITY_MICROPHONE           = 0x00800000,
-	OSCAR_CAPABILITY_VIDEO                = 0x01000000,
-	OSCAR_CAPABILITY_ICHATAV              = 0x02000000,
-	OSCAR_CAPABILITY_LIVEVIDEO            = 0x04000000,
-	OSCAR_CAPABILITY_CAMERA               = 0x08000000,
-	OSCAR_CAPABILITY_ICHAT_SCREENSHARE    = 0x10000000,
-	OSCAR_CAPABILITY_XHTML_IM             = 0x20000000,
-	OSCAR_CAPABILITY_GENERICUNKNOWN       = 0x40000000,
-	OSCAR_CAPABILITY_LAST                 = 0x80000000
+	OSCAR_CAPABILITY_VIDEO                = 0x00800000,
+	OSCAR_CAPABILITY_ICHATAV              = 0x01000000,
+	OSCAR_CAPABILITY_LIVEVIDEO            = 0x02000000,
+	OSCAR_CAPABILITY_CAMERA               = 0x04000000,
+	OSCAR_CAPABILITY_ICHAT_SCREENSHARE    = 0x08000000,
+	OSCAR_CAPABILITY_GENERICUNKNOWN       = 0x10000000,
+	OSCAR_CAPABILITY_LAST                 = 0x20000000
 } OscarCapability;
 
 /*