Mercurial > pidgin.yaz

changeset 23526:4cb1efafa410

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some checks for MSN protocol_ver < 15. Those versions are different enough that they won't be supported at all on this branch.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 15 Jun 2008 18:48:14 +0000
parents ace1cd072e2f
children 314fcd0879ec
files libpurple/protocols/msn/notification.c libpurple/protocols/msn/user.c
diffstat 2 files changed, 8 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c	Sun Jun 15 08:22:20 2008 +0000
+++ b/libpurple/protocols/msn/notification.c	Sun Jun 15 18:48:14 2008 +0000
@@ -105,7 +105,6 @@
 
 	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 @@
 
 	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,17 +1149,14 @@
 		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);
--- a/libpurple/protocols/msn/user.c	Sun Jun 15 08:22:20 2008 +0000
+++ b/libpurple/protocols/msn/user.c	Sun Jun 15 18:48:14 2008 +0000
@@ -295,9 +295,6 @@
 	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);