diff libpurple/protocols/msnp9/user.c @ 21685:b08d0296ab88

Fix 2 more issues related to friendly names: - Don't try setting any friendly names for unverified passports - Don't try setting a friendly name if they are not actually on our friend list Fixes #4109
author Stu Tomlinson <stu@nosnilmot.com>
date Wed, 28 Nov 2007 19:14:26 +0000
parents 4bc7d44f543a
children 5ffb0b5f785f
line wrap: on
line diff
--- a/libpurple/protocols/msnp9/user.c	Wed Nov 28 14:00:50 2007 +0000
+++ b/libpurple/protocols/msnp9/user.c	Wed Nov 28 19:14:26 2007 +0000
@@ -126,16 +126,20 @@
 msn_user_set_friendly_name(MsnUser *user, const char *name)
 {
 	MsnCmdProc *cmdproc;
+	MsnSession *session;
 	const char *encoded;
 
 	g_return_if_fail(user != NULL);
 
 	encoded = purple_url_encode(name);
+	session = user->userlist->session;
 
-	if (user->friendly_name && strcmp(user->friendly_name, name) && (strlen(encoded) < 387)) {
+	if (user->friendly_name && strcmp(user->friendly_name, name)
+		&& (strlen(encoded) < 387) && session->passport_info.verified &&
+		(user->list_op & MSN_LIST_FL_OP)) {
 		/* copy the new name to the server list, but only when new */
 		/* should we check this more thoroughly? */
-		cmdproc = user->userlist->session->notification->cmdproc;
+		cmdproc = session->notification->cmdproc;
 		msn_cmdproc_send(cmdproc, "REA", "%s %s",
 						 user->passport,
 						 encoded);