adium: d16ca7e7: applied changes from 79b15a2f60ca8445998...

[thijsalkemade at gmail.com]

----------------------------------------------------------------------
Revision: d16ca7e729ce59f8f8f5651ae90163562deefa6b
Parent:   f5358148539500db1af681b90d18481a7277906c
Author:   thijsalkemade at gmail.com
Date:     06/26/11 17:38:35
Branch:   im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/d16ca7e729ce59f8f8f5651ae90163562deefa6b

Changelog: 

applied changes from 79b15a2f60ca8445998f5c26ed7d0e2449d87f66
             through 9fa905dc57b224f6ecc51361480da7be9668055c

Also go back to MSNp15 here, for now.

Changes against parent f5358148539500db1af681b90d18481a7277906c

  patched  libpurple/protocols/msn/msn.h

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.h	2b9dc0da233cb36c2afcfef9465d20c7810cd17e
+++ libpurple/protocols/msn/msn.h	c7ac488598cb69e7de667a8f4eb9d271c892b58e
@@ -117,7 +117,8 @@ typedef enum
 #define MSN_PORT 1863
 #define WLM_PROT_VER		16
 
-#define WLM_MAX_PROTOCOL	16
+/* Max protocol upstream is 16, but this breaks file transfer, contact icons and receiving custom emoticons */
+#define WLM_MAX_PROTOCOL	/* 16 */ 15
 #define WLM_MIN_PROTOCOL	15
 
 #define MSN_TYPING_RECV_TIMEOUT 6