# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1212871066 0
# Node ID d4cc956acb37036886c48f744308b42a883e50a9
# Parent  4a657f024a3a3fe439e579a9afc5a85b2078726f# Parent  b3ec26e66e265f8b8465d20e28d9fd8788dfcf8a
merge of '00a9efda899566f921e7c8bbe98a0eb684855f62'
     and '3eeb91e664292daec9b2da60f43bbda91140b1de'

diff -r 4a657f024a3a -r d4cc956acb37 libpurple/protocols/oscar/family_locate.c
--- a/libpurple/protocols/oscar/family_locate.c	Sat Jun 07 20:37:18 2008 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Sat Jun 07 20:37:46 2008 +0000
@@ -171,7 +171,7 @@
 	 {0x09, 0x46, 0xf0, 0x03, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	{OSCAR_CAPABILITY_GENERICUNKNOWN,
+	{OSCAR_CAPABILITY_ICHAT_SCREENSHARE,
 	 {0x09, 0x46, 0xf0, 0x04, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
diff -r 4a657f024a3a -r d4cc956acb37 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sat Jun 07 20:37:18 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Jun 07 20:37:46 2008 +0000
@@ -707,6 +707,9 @@
 			case OSCAR_CAPABILITY_CAMERA:
 				tmp = _("Camera");
 				break;
+			case OSCAR_CAPABILITY_ICHAT_SCREENSHARE:
+				tmp = _("Screen Sharing");
+				break;
 			default:
 				tmp = NULL;
 				break;
diff -r 4a657f024a3a -r d4cc956acb37 libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Sat Jun 07 20:37:18 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Sat Jun 07 20:37:46 2008 +0000
@@ -353,7 +353,8 @@
 	OSCAR_CAPABILITY_ICHATAV              = 0x02000000,
 	OSCAR_CAPABILITY_LIVEVIDEO            = 0x04000000,
 	OSCAR_CAPABILITY_CAMERA               = 0x08000000,
-	OSCAR_CAPABILITY_LAST                 = 0x10000000
+	OSCAR_CAPABILITY_ICHAT_SCREENSHARE	  = 0x10000000,
+	OSCAR_CAPABILITY_LAST                 = 0x20000000
 } OscarCapability;
 
 /*