pidgin: 3eeb91e6: Specified one of the OSCAR_CAPABILITY_GE...

evands at pidgin.im evands at pidgin.im
Sat Jun 7 15:50:43 EDT 2008


-----------------------------------------------------------------
Revision: 3eeb91e664292daec9b2da60f43bbda91140b1de
Ancestor: bd9708fed922d9c7c3c4e54e4f20713b6844778d
Author: evands at pidgin.im
Date: 2008-06-07T18:52:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3eeb91e664292daec9b2da60f43bbda91140b1de

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

ChangeLog: 

Specified one of the OSCAR_CAPABILITY_GENERICUNKNOWN capabilities to be
OSCAR_CAPABILITY_ICHAT_SCREENSHARE, the screen sharing facility in iChat.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_locate.c	88a8d35baa43384fde9f7079838291ef397c7274
+++ libpurple/protocols/oscar/family_locate.c	7fbb8f071d020f5c41f0d303b717f70126222a56
@@ -171,7 +171,7 @@ static const struct {
 	 {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}},
 
============================================================
--- libpurple/protocols/oscar/oscar.c	716240f987affc5a828d3cb735c8a3a522a03454
+++ libpurple/protocols/oscar/oscar.c	8258216181efebb2d6a59453bcfa6d25e1c013b1
@@ -707,6 +707,9 @@ static gchar *oscar_caps_to_string(Oscar
 			case OSCAR_CAPABILITY_CAMERA:
 				tmp = _("Camera");
 				break;
+			case OSCAR_CAPABILITY_ICHAT_SCREENSHARE:
+				tmp = _("Screen Sharing");
+				break;
 			default:
 				tmp = NULL;
 				break;
============================================================
--- libpurple/protocols/oscar/oscar.h	e8c5db2f4a4b035c65fc414be0f359b140522c04
+++ libpurple/protocols/oscar/oscar.h	a40e3332eade975c73e344e17bd06d4b99cae751
@@ -353,7 +353,8 @@ typedef enum
 	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;
 
 /*


More information about the Commits mailing list