# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1242714924 0
# Node ID 338ac8c4393180930a12a82b724f3827b88048fb
# Parent  56460ebd15587d8299b02871db60ec9097fc738d# Parent  99e3f40d082ff96d38c0bd81d2a457a3c3a9e02f
merge of '062468e9e5c7b0a7d4fb51cbd78c9a769cbd120a'
     and '13f518fad2e8dacf137c733223da9b6d535c8ae1'

diff -r 56460ebd1558 -r 338ac8c43931 libpurple/protocols/oscar/family_locate.c
--- a/libpurple/protocols/oscar/family_locate.c	Tue May 19 05:56:50 2009 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Tue May 19 06:35:24 2009 +0000
@@ -68,8 +68,12 @@
 	 {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_VIDEO,
+	{OSCAR_CAPABILITY_LIVEVIDEO,
 	 {0x09, 0x46, 0x01, 0x01, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
diff -r 56460ebd1558 -r 338ac8c43931 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue May 19 05:56:50 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue May 19 06:35:24 2009 +0000
@@ -714,6 +714,9 @@
 			case OSCAR_CAPABILITY_ICHATAV:
 				tmp = _("iChat AV");
 				break;
+			case OSCAR_CAPABILITY_LIVEVIDEO:
+				tmp = _("Live Video");
+				break;
 			case OSCAR_CAPABILITY_CAMERA:
 				tmp = _("Camera");
 				break;
diff -r 56460ebd1558 -r 338ac8c43931 libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Tue May 19 05:56:50 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Tue May 19 06:35:24 2009 +0000
@@ -369,11 +369,12 @@
 	OSCAR_CAPABILITY_SMS                  = 0x00400000,
 	OSCAR_CAPABILITY_VIDEO                = 0x00800000,
 	OSCAR_CAPABILITY_ICHATAV              = 0x01000000,
-	OSCAR_CAPABILITY_CAMERA               = 0x02000000,
-	OSCAR_CAPABILITY_ICHAT_SCREENSHARE    = 0x04000000,
-	OSCAR_CAPABILITY_TYPING               = 0x08000000,
-	OSCAR_CAPABILITY_GENERICUNKNOWN       = 0x10000000,
-	OSCAR_CAPABILITY_LAST                 = 0x20000000
+	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
 } OscarCapability;
 
 /*