pidgin: 4220a157: Add the session user to the userlist. Th...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 4220a157ee1e37ad605df13d61e9891ef996f6d7
Parent:   22180849de87990f561a0e088cc9cf081c52453b
Author:   qulogic at pidgin.im
Date:     12/10/10 01:38:17
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4220a157ee1e37ad605df13d61e9891ef996f6d7

Changelog: 

Add the session user to the userlist. This reduces the amount of
special-casing needed and corrects the buddy icon if you have yourself
on your list.

Fixes #12973.

Changes against parent 22180849de87990f561a0e088cc9cf081c52453b

  patched  ChangeLog
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/session.c

-------------- next part --------------
============================================================
--- ChangeLog	a7de0f4f801044ade26656216f17120734f93cb3
+++ ChangeLog	87d1632172c4691e1afb10069b73ad88bc0776c3
@@ -37,6 +37,7 @@ version 2.7.8 (??/??/????):
 	* Correctly update your own display name in the buddy list. (#13064) 
 	* Correctly show ourselves as offline in the buddy list when going
 	  invisible. (#12945)
+	* Correctly update your own icon in the buddy list. (#12973)
 
 	XMPP:
 	* Terminate Jingle sessions with unsupported content types. (#13048)
============================================================
--- libpurple/protocols/msn/notification.c	ffd70318a7160ee520bd29e760ced6044fbcbd89
+++ libpurple/protocols/msn/notification.c	2ebb21ca5f2dc56dfaa01762db104d3d890144ab
@@ -1250,10 +1250,7 @@ nln_cmd(MsnCmdProc *cmdproc, MsnCommand 
 	networkid = atoi(cmd->params[2]);
 	friendly = purple_url_decode(cmd->params[3]);
 
-	if (g_str_equal(passport, session->user->passport))
-		user = session->user;
-	else
-		user = msn_userlist_find_user(session->userlist, passport);
+	user = msn_userlist_find_user(session->userlist, passport);
 	if (user == NULL) return;
 
 	if (msn_user_set_friendly_name(user, friendly) && user != session->user)
@@ -1705,10 +1702,7 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCom
 	session = cmdproc->session;
 
 	passport = cmd->params[0];
-	if (g_str_equal(passport, session->user->passport))
-		user = session->user;
-	else
-		user = msn_userlist_find_user(session->userlist, passport);
+	user = msn_userlist_find_user(session->userlist, passport);
 	if (user == NULL) {
 		char *str = g_strndup(payload, len);
 		purple_debug_info("msn", "unknown user %s, payload is %s\n",
============================================================
--- libpurple/protocols/msn/session.c	0397ae403a9ad8676a6935ca5c633dd7461d5051
+++ libpurple/protocols/msn/session.c	97c71478eb63f3602c4e893b4ddd3fbaec575acc
@@ -46,6 +46,7 @@ msn_session_new(PurpleAccount *account)
 
 	session->user = msn_user_new(session->userlist,
 								 purple_account_get_username(account), NULL);
+	msn_userlist_add_user(session->userlist, msn_user_ref(session->user));
 	session->oim = msn_oim_new(session);
 
 	session->protocol_ver = 0;