# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177815154 0
# Node ID 2ef9bdf1a4eb550dd6d6a2c909d88d9564df6332
# Parent  bb039b61f16e751c8cc9dcdae98a429a1ec7e5f7# Parent  56cc78d3d04f57a56677531c076a815bbe0dd586
merge of '5fa93507a0f0a385a9d18978a71f3ffb0a374ddb'
     and '81a31152b247aea829da5baa632c71fddb3165d6'

diff -r bb039b61f16e -r 2ef9bdf1a4eb libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Sun Apr 29 02:51:33 2007 +0000
+++ b/libpurple/protocols/msn/slp.c	Sun Apr 29 02:52:34 2007 +0000
@@ -955,7 +955,7 @@
 
 	if (obj == NULL)
 	{
-/*		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;
 	}