cpw.qulogic.msn: a66de00d: Remove some checks for MSN protocol_ver ...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: a66de00d99c134fa78249cb8a8db0c3bb1cc87a1
Ancestor: 5ec131b7963df7614ef71243e12b2b558eb5211f
Author: qulogic at pidgin.im
Date: 2008-06-15T18:48:14
Branch: im.pidgin.cpw.qulogic.msn
URL: http://d.pidgin.im/viewmtn/revision/info/a66de00d99c134fa78249cb8a8db0c3bb1cc87a1

Modified files:
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/user.c

ChangeLog: 

Remove some checks for MSN protocol_ver < 15. Those versions are 
different enough that they won't be supported at all on this branch.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/notification.c	70ad836eef568b666503730aa6944ee76add41d7
+++ libpurple/protocols/msn/notification.c	6a07f780ffcab83b3f37f9649bebafccf25576b8
@@ -105,7 +105,6 @@ connect_cb(MsnServConn *servconn)
 
 	vers = g_string_new("");
 
-/*	for (i = session->protocol_ver; i >= WLM_MIN_PROTOCOL; i--) */
 	for (i = WLM_MAX_PROTOCOL; i >= WLM_MIN_PROTOCOL; i--)
 		g_string_append_printf(vers, " MSNP%d", i);
 
@@ -1038,7 +1037,7 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand 
 
 	msn_user_set_friendly_name(user, friendly);
 
-	if (session->protocol_ver >= 9 && cmd->param_count == 8)
+	if (cmd->param_count == 8)
 	{
 		msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[6]));
 		msn_user_set_object(user, msnobj);
@@ -1150,18 +1149,15 @@ nln_cmd(MsnCmdProc *cmdproc, MsnCommand 
 		msn_user_set_friendly_name(user, friendly);
 	}
 
-	if (session->protocol_ver >= 9)
+	if (cmd->param_count == 7)
 	{
-		if (cmd->param_count == 7)
-		{
-			msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[5]));
-			msn_user_set_object(user, msnobj);
-		}
-		else
-		{
-			msn_user_set_object(user, NULL);
-		}
+		msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[5]));
+		msn_user_set_object(user, msnobj);
 	}
+	else
+	{
+		msn_user_set_object(user, NULL);
+	}
 
 	clientid = strtoul(cmd->params[4], NULL, 10);
 	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->phone.mobile && user->phone.mobile[0] == '+');
============================================================
--- libpurple/protocols/msn/user.c	e9e6f90f56daf7bdd8e996ba3983086800ea1865
+++ libpurple/protocols/msn/user.c	b17370b7e58d44e79034a405f924909254fc8fb6
@@ -295,9 +295,6 @@ msn_user_is_yahoo(PurpleAccount *account
 	if (gc != NULL)
 		session = gc->proto_data;
 
-	if ((session != NULL) && (session->protocol_ver == WLM_PROT_VER))
-		return FALSE;
-
 	if ((session != NULL) && (user = msn_userlist_find_user(session->userlist, name)) != NULL)
 	{
 		return (user->networkid == MSN_NETWORK_YAHOO);