changeset 10955:83a79d69160c

[gaim-migrate @ 12755] sf patch #1210535, from Levi Bard Drops enter/leave/nick change messages for ignored users committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 01 Jun 2005 00:09:01 +0000
parents ec90b7d126be
children cc74e6d7b44c
files src/conversation.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/conversation.c	Tue May 31 23:51:20 2005 +0000
+++ b/src/conversation.c	Wed Jun 01 00:09:01 2005 +0000
@@ -1920,7 +1920,8 @@
 	ops  = gaim_conversation_get_ui_ops(conv);
 
 	quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(),
-					 "chat-buddy-joining", conv, user, flags));
+					 "chat-buddy-joining", conv, user, flags)) |
+			gaim_conv_chat_is_user_ignored(chat, user);
 
 	cb = gaim_conv_chat_cb_new(user, flags);
 
@@ -2028,7 +2029,8 @@
 		its_me = TRUE;
 	}
 
-	if (gaim_prefs_get_bool("/core/conversations/chat/show_nick_change")) {
+	if (gaim_prefs_get_bool("/core/conversations/chat/show_nick_change") ||
+		gaim_conv_chat_is_user_ignored(chat, new_user)) {
 		if(its_me) {
 			g_snprintf(tmp, sizeof(tmp),
 					_("You are now known as %s"), new_user);
@@ -2057,7 +2059,8 @@
 	ops  = gaim_conversation_get_ui_ops(conv);
 
 	quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(),
-				"chat-buddy-leaving", conv, user, reason));
+				"chat-buddy-leaving", conv, user, reason)) |
+			gaim_conv_chat_is_user_ignored(chat, user);
 
 	if (ops != NULL && ops->chat_remove_user != NULL)
 		ops->chat_remove_user(conv, user);