merge of '082cb6577e6dede908826bc73a512645071673fe' v2_0_0beta7

Mon, 30 Apr 2007 05:06:29 +0000

author
Sean Egan <seanegan@pidgin.im>
date
Mon, 30 Apr 2007 05:06:29 +0000
changeset 16772
1f0524cd66b3
parent 16771
082cb6577e6d (current diff)
parent 16764
bf9779a51471 (diff)
child 16773
e1171eb45f07
child 16775
8627d2560d40
child 17888
b03bd97b2027

merge of '082cb6577e6dede908826bc73a512645071673fe'
and 'bf9779a51471f98c95339f8736da02b6af1a0a89'

--- a/libpurple/protocols/msn/slp.c	Mon Apr 30 04:43:52 2007 +0000
+++ b/libpurple/protocols/msn/slp.c	Mon Apr 30 05:06:29 2007 +0000
@@ -955,7 +955,7 @@
 
 	if (obj == NULL)
 	{
-		purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
+		/* TODO purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); */
 		return;
 	}
 

mercurial