# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1258956804 0
# Node ID 1b8e39c6d1f384eaf4c556ddef561772c8ebd1c5
# Parent  a401d3500a7502151ef68b29ed56a3c204c006ac# Parent  588fb0db1cd8de72259ac220f676c1b3534d25ee
merge of '4ede3b155e9d443dcec45785cecef60b7af55de9'
     and 'a32b7088cc5f5afb18b147305a3b0b278b7c3dfb'

diff -r 588fb0db1cd8 -r 1b8e39c6d1f3 libpurple/protocols/msn/msn.h
--- a/libpurple/protocols/msn/msn.h	Mon Nov 23 00:19:33 2009 +0000
+++ b/libpurple/protocols/msn/msn.h	Mon Nov 23 06:13:24 2009 +0000
@@ -90,39 +90,50 @@
 
 typedef enum
 {
-	MSN_CLIENT_CAP_WIN_MOBILE = 0x000001,
-	MSN_CLIENT_CAP_INK_GIF    = 0x000004,
-	MSN_CLIENT_CAP_INK_ISF    = 0x000008,
-	MSN_CLIENT_CAP_VIDEO_CHAT = 0x000010,
-	MSN_CLIENT_CAP_PACKET     = 0x000020,
-	MSN_CLIENT_CAP_MSNMOBILE  = 0x000040,
-	MSN_CLIENT_CAP_MSNDIRECT  = 0x000080,
-	MSN_CLIENT_CAP_WEBMSGR    = 0x000200,
-	MSN_CLIENT_CAP_TGW        = 0x000800,
-	MSN_CLIENT_CAP_SPACE      = 0x001000,
-	MSN_CLIENT_CAP_MCE        = 0x002000,
-	MSN_CLIENT_CAP_DIRECTIM   = 0x004000,
-	MSN_CLIENT_CAP_WINKS      = 0x008000,
-	MSN_CLIENT_CAP_SEARCH     = 0x010000,
-	MSN_CLIENT_CAP_BOT        = 0x020000,
-	MSN_CLIENT_CAP_VOICEIM    = 0x040000,
-	MSN_CLIENT_CAP_SCHANNEL   = 0x080000,
-	MSN_CLIENT_CAP_SIP_INVITE = 0x100000,
-	MSN_CLIENT_CAP_SDRIVE     = 0x400000
+	MSN_CLIENT_CAP_WIN_MOBILE = 0x0000001,
+	MSN_CLIENT_CAP_INK_GIF    = 0x0000004,
+	MSN_CLIENT_CAP_INK_ISF    = 0x0000008,
+	MSN_CLIENT_CAP_VIDEO_CHAT = 0x0000010,
+	MSN_CLIENT_CAP_PACKET     = 0x0000020,
+	MSN_CLIENT_CAP_MSNMOBILE  = 0x0000040,
+	MSN_CLIENT_CAP_MSNDIRECT  = 0x0000080,
+	MSN_CLIENT_CAP_WEBMSGR    = 0x0000200,
+	MSN_CLIENT_CAP_TGW        = 0x0000800,
+	MSN_CLIENT_CAP_SPACE      = 0x0001000,
+	MSN_CLIENT_CAP_MCE        = 0x0002000,
+	MSN_CLIENT_CAP_DIRECTIM   = 0x0004000,
+	MSN_CLIENT_CAP_WINKS      = 0x0008000,
+	MSN_CLIENT_CAP_SEARCH     = 0x0010000,
+	MSN_CLIENT_CAP_BOT        = 0x0020000,
+	MSN_CLIENT_CAP_VOICEIM    = 0x0040000,
+	MSN_CLIENT_CAP_SCHANNEL   = 0x0080000,
+	MSN_CLIENT_CAP_SIP_INVITE = 0x0100000,
+	MSN_CLIENT_CAP_SDRIVE     = 0x0400000,
+	MSN_CLIENT_CAP_ONECARE    = 0x1000000,
+	MSN_CLIENT_CAP_P2P_TURN   = 0x2000000,
+	MSN_CLIENT_CAP_P2P_BOOTSTRAP_VIA_UUN = 0x4000000,
 
 } MsnClientCaps;
 
 typedef enum
 {
-	MSN_CLIENT_VER_5_0 = 0x00,
-	MSN_CLIENT_VER_6_0 = 0x10,	/* MSNC1 */
-	MSN_CLIENT_VER_6_1 = 0x20,	/* MSNC2 */
-	MSN_CLIENT_VER_6_2 = 0x30,	/* MSNC3 */
-	MSN_CLIENT_VER_7_0 = 0x40,	/* MSNC4 */
-	MSN_CLIENT_VER_7_5 = 0x50,	/* MSNC5 */
-	MSN_CLIENT_VER_8_0 = 0x60,	/* MSNC6 */
-	MSN_CLIENT_VER_8_1 = 0x70,	/* MSNC7 */
-	MSN_CLIENT_VER_8_5 = 0x80	/* MSNC8 */
+	MSN_CLIENT_EXT_CAP_RTC_VIDEO = 0x10,
+	MSN_CLIENT_EXT_CAP_P2PV2     = 0x20
+} MsnClientExtCaps;
+
+typedef enum
+{
+	MSN_CLIENT_VER_5_0  = 0x00,
+	MSN_CLIENT_VER_6_0  = 0x10,	/* MSNC1 */
+	MSN_CLIENT_VER_6_1  = 0x20,	/* MSNC2 */
+	MSN_CLIENT_VER_6_2  = 0x30,	/* MSNC3 */
+	MSN_CLIENT_VER_7_0  = 0x40,	/* MSNC4 */
+	MSN_CLIENT_VER_7_5  = 0x50,	/* MSNC5 */
+	MSN_CLIENT_VER_8_0  = 0x60,	/* MSNC6 */
+	MSN_CLIENT_VER_8_1  = 0x70,	/* MSNC7 */
+	MSN_CLIENT_VER_8_5  = 0x80,	/* MSNC8 */
+	MSN_CLIENT_VER_9_0  = 0x90,	/* MSNC9 */
+	MSN_CLIENT_VER_14_0 = 0xA0	/* MSNC10 */
 
 } MsnClientVerId;
 
@@ -133,6 +144,8 @@
 	((MSN_CLIENT_ID_VERSION    << 24) | \
 	 (MSN_CLIENT_ID_CAPABILITIES))
 
+#define MSN_CLIENT_EXT_ID 0
+
 gboolean msn_email_is_valid(const char *passport);
 void msn_act_id(PurpleConnection *gc, const char *entry);
 void msn_send_privacy(PurpleConnection *gc);