changeset
merge of '6d92632a64248dfb0610b65b20bcf38b6190e0e5'
Thu, 29 Nov 2007 23:18:51 +0000
- author
- Daniel Atallah <datallah@pidgin.im>
- date
- Thu, 29 Nov 2007 23:18:51 +0000
- changeset 21802
- c76453c210c7
- parent 21801
- 6d92632a6424 (current diff)
- parent 21799
- b78d10043de7 (diff)
- child 21803
- 1fa4a4fa5b8f
merge of '6d92632a64248dfb0610b65b20bcf38b6190e0e5'
and 'b78d10043de7f3e86d90e04819cb724901fb881d'
--- a/libpurple/protocols/irc/parse.c Thu Nov 29 23:18:33 2007 +0000 +++ b/libpurple/protocols/irc/parse.c Thu Nov 29 23:18:51 2007 +0000 @@ -64,7 +64,7 @@ { "318", "nt:", irc_msg_endwhois }, /* End of WHOIS */ { "319", "nn:", irc_msg_whois }, /* Whois channels */ { "320", "nn:", irc_msg_whois }, /* Whois (fn ident) */ - { "314", "nnvvv:", irc_msg_whois }, /* Whowas user */ + { "314", "nnnvv:", irc_msg_whois }, /* Whowas user */ { "369", "nt:", irc_msg_endwhois }, /* End of WHOWAS */ { "321", "*", irc_msg_list }, /* Start of list */ { "322", "ncv:", irc_msg_list }, /* List. */
--- a/libpurple/protocols/msnp9/notification.c Thu Nov 29 23:18:33 2007 +0000 +++ b/libpurple/protocols/msnp9/notification.c Thu Nov 29 23:18:51 2007 +0000 @@ -235,6 +235,8 @@ /* OK */ const char *friendly = purple_url_decode(cmd->params[3]); + session->passport_info.verified = atoi(cmd->params[4]); + purple_connection_set_display_name(gc, friendly); msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN);
--- a/libpurple/protocols/msnp9/session.h Thu Nov 29 23:18:33 2007 +0000 +++ b/libpurple/protocols/msnp9/session.h Thu Nov 29 23:18:51 2007 +0000 @@ -114,7 +114,7 @@ char *file; char *client_ip; int client_port; - + int verified; } passport_info; };
--- a/libpurple/protocols/msnp9/user.c Thu Nov 29 23:18:33 2007 +0000 +++ b/libpurple/protocols/msnp9/user.c Thu Nov 29 23:18:51 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);
