changeset 26875:40528ba387fd

Uh, OSCAR_CAPABILITY_VIDEO and OSCAR_CAPABILITY_LIVEVIDEO video have the same value. Surely we don't need two of them.
author Mark Doliner <mark@kingant.net>
date Thu, 14 May 2009 03:54:05 +0000
parents eeee4309d3d8
children 99e3f40d082f ab298d237562
files libpurple/protocols/oscar/family_locate.c libpurple/protocols/oscar/oscar.c libpurple/protocols/oscar/oscar.h
diffstat 3 files changed, 6 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_locate.c	Wed May 13 20:29:03 2009 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Thu May 14 03:54:05 2009 +0000
@@ -68,12 +68,8 @@
 	 {0x09, 0x46, 0x00, 0x02, 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_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,
 	 {0x09, 0x46, 0x01, 0x01, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
--- a/libpurple/protocols/oscar/oscar.c	Wed May 13 20:29:03 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Thu May 14 03:54:05 2009 +0000
@@ -714,9 +714,6 @@
 			case OSCAR_CAPABILITY_ICHATAV:
 				tmp = _("iChat AV");
 				break;
-			case OSCAR_CAPABILITY_LIVEVIDEO:
-				tmp = _("Live Video");
-				break;
 			case OSCAR_CAPABILITY_CAMERA:
 				tmp = _("Camera");
 				break;
--- a/libpurple/protocols/oscar/oscar.h	Wed May 13 20:29:03 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Thu May 14 03:54:05 2009 +0000
@@ -369,12 +369,11 @@
 	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;
 
 /*