merge of 'e9f12eb06c5b8c4a1af8d1ac70e54a4ad447e9fc'

Thu, 03 May 2007 22:08:05 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Thu, 03 May 2007 22:08:05 +0000
changeset 16901
a867d23a4c27
parent 16900
e9f12eb06c5b (current diff)
parent 16765
058e9e5d7cee (diff)
child 16902
bff0ee9ac3da

merge of 'e9f12eb06c5b8c4a1af8d1ac70e54a4ad447e9fc'
and '058e9e5d7cee0e407742c3c42df4cc5b62627d82'

--- a/libpurple/protocols/msn/slp.c	Thu May 03 21:57:49 2007 +0000
+++ b/libpurple/protocols/msn/slp.c	Thu May 03 22:08:05 2007 +0000
@@ -955,7 +955,7 @@
 
 	if (obj == NULL)
 	{
-		/* TODO purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); */
+		purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
 		return;
 	}
 

mercurial