Mercurial > pidgin.yaz

diff libpurple/protocols/msn/user.c @ 31299:4445ae4215b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't destroy our local object storing the display picture when a NLN command show us the same MsnObject.
author masca@cpw.pidgin.im
date Mon, 02 Aug 2010 20:36:02 +0000
parents 56ef12440d52
children 1f16cfce4718
line wrap: on
line diff
--- a/libpurple/protocols/msn/user.c	Fri Jul 30 18:21:59 2010 +0000
+++ b/libpurple/protocols/msn/user.c	Mon Aug 02 20:36:02 2010 +0000
@@ -577,7 +577,7 @@
 {
 	g_return_if_fail(user != NULL);
 
-	if (user->msnobj != NULL)
+	if (user->msnobj != NULL && !msn_object_find_local(msn_object_get_sha1(obj)))
 		msn_object_destroy(user->msnobj);
 
 	user->msnobj = obj;