pidgin: f4e1d876: Uh, OSCAR_CAPABILITY_VIDEO and OSCAR_CAP...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: f4e1d87650834d9a82d09020df0fb030f25854e0
Ancestor: 191873f724e4551edc337f1e018980f32c41391b
Author: markdoliner at pidgin.im
Date: 2009-05-14T03:54:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f4e1d87650834d9a82d09020df0fb030f25854e0

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

ChangeLog: 

Uh, OSCAR_CAPABILITY_VIDEO and OSCAR_CAPABILITY_LIVEVIDEO video have the
same value.  Surely we don't need two of them.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_locate.c	3aa1fd6c3a338cc7a88856361056860d47f0373d
+++ libpurple/protocols/oscar/family_locate.c	43b0e60c9f8666e14a48657ff2665e6c269c40b5
@@ -68,12 +68,8 @@ static const struct {
 	 {0x09, 0x46, 0x00, 0x02, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	{OSCAR_CAPABILITY_VIDEO,
-	 {0x09, 0x46, 0x01, 0x00, 0x4c, 0x7f, 0x11, 0xd1,
-	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
-
 	/* "Live Video" (SIP/RTC Video) support in Windows AIM 5.5.3501 and newer */
-	{OSCAR_CAPABILITY_LIVEVIDEO,
+	{OSCAR_CAPABILITY_VIDEO,
 	 {0x09, 0x46, 0x01, 0x01, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
============================================================
--- libpurple/protocols/oscar/oscar.c	0cea4ff7eefc8f09a7a2e875a4057d43dfe48ed8
+++ libpurple/protocols/oscar/oscar.c	677890984f287d5e28f70c8fedd0680645636767
@@ -714,9 +714,6 @@ static gchar *oscar_caps_to_string(Oscar
 			case OSCAR_CAPABILITY_ICHATAV:
 				tmp = _("iChat AV");
 				break;
-			case OSCAR_CAPABILITY_LIVEVIDEO:
-				tmp = _("Live Video");
-				break;
 			case OSCAR_CAPABILITY_CAMERA:
 				tmp = _("Camera");
 				break;
============================================================
--- libpurple/protocols/oscar/oscar.h	d5ac762f9a3ce6a18c2f23da07491d6ea7d207da
+++ libpurple/protocols/oscar/oscar.h	18672ae648d2716f765d42e4d8e5647fe9977289
@@ -369,12 +369,11 @@ typedef enum
 	OSCAR_CAPABILITY_SMS                  = 0x00400000,
 	OSCAR_CAPABILITY_VIDEO                = 0x00800000,
 	OSCAR_CAPABILITY_ICHATAV              = 0x01000000,
-	OSCAR_CAPABILITY_LIVEVIDEO            = 0x02000000,
-	OSCAR_CAPABILITY_CAMERA               = 0x04000000,
-	OSCAR_CAPABILITY_ICHAT_SCREENSHARE    = 0x08000000,
-	OSCAR_CAPABILITY_TYPING               = 0x10000000,
-	OSCAR_CAPABILITY_GENERICUNKNOWN       = 0x20000000,
-	OSCAR_CAPABILITY_LAST                 = 0x40000000
+	OSCAR_CAPABILITY_CAMERA               = 0x02000000,
+	OSCAR_CAPABILITY_ICHAT_SCREENSHARE    = 0x04000000,
+	OSCAR_CAPABILITY_TYPING               = 0x08000000,
+	OSCAR_CAPABILITY_GENERICUNKNOWN       = 0x10000000,
+	OSCAR_CAPABILITY_LAST                 = 0x20000000
 } OscarCapability;
 
 /*