changeset 21027:f9fd63586fcb

merge of '3a8a65c746e023953f147a9069128a4df23e97bf' and 'a1750b6bfef2b654e1620a586e4bf6c58bc3a6a9'
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 27 Oct 2007 13:28:03 +0000
parents 77a35a382a73 (current diff) 27c72bd82a81 (diff)
children e4cf0506be74
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c	Sat Oct 27 13:23:01 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Sat Oct 27 13:28:03 2007 +0000
@@ -617,7 +617,12 @@
 	 * XXX: blocked icon overlay isn't always accurate for MSN.
 	 * XXX: This can die as soon as purple_privacy_check() knows that
 	 * XXX: this prpl always honors both the allow and deny lists. */
-	if (user)
+	/* While the above comment may be strictly correct (the privacy API needs
+	 * rewriteing), purple_privacy_check() is going to be more accurate at
+	 * indicating whether a particular buddy is going to be able to message
+	 * you, which is the important information that this is trying to convey.
+	 */
+	if (full && user)
 	{
 		purple_notify_user_info_add_pair(user_info, _("Blocked"),
 									   ((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No")));