[Adium-commits] adium 2018:c0f142ff6f98: Avoid trying to create a chat while an ...

adium-commits at adiumx.com adium-commits at adiumx.com
Tue Apr 28 15:56:47 UTC 2009


details:	http://hg.adiumx.com/adium/rev/c0f142ff6f98
revision:	2018:c0f142ff6f98
author:		Zachary West <zacw at adiumx.com>
date:		Tue Apr 28 11:56:39 2009 -0400

Avoid trying to create a chat while an account is disconnecting when trying to determine ignore status.

diffstat:

 Plugins/Purple Service/SLPurpleCocoaAdapter.m |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r ffda06c9025e -r c0f142ff6f98 Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Tue Apr 28 10:44:15 2009 -0400
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Tue Apr 28 11:56:39 2009 -0400
@@ -1162,7 +1162,11 @@
 
 - (BOOL)contact:(AIListContact *)inContact isIgnoredInChat:(AIChat *)inChat
 {
-	PurpleConversation *conv = convLookupFromChat(inChat, inChat.account);
+	PurpleConversation *conv = existingConvLookupFromChat(inChat);
+	
+	if (!conv)
+		return NO;
+	
 	PurpleConvChat *convChat = purple_conversation_get_chat_data(conv);
 
 	return (purple_conv_chat_is_user_ignored(convChat, [inContact.UID UTF8String]) ? YES : NO);
@@ -1170,7 +1174,11 @@
 
 - (void)setContact:(AIListContact *)inContact ignored:(BOOL)inIgnored inChat:(AIChat *)inChat
 {
-	PurpleConversation *conv = convLookupFromChat(inChat, inChat.account);
+	PurpleConversation *conv = existingConvLookupFromChat(inChat);
+	
+	if (!conv)
+		return;
+	
 	PurpleConvChat *convChat = purple_conversation_get_chat_data(conv);
 	
 	if ([self contact:inContact isIgnoredInChat:inChat]) {




More information about the commits mailing list