adium 3651:3e6ee7b5e497: Properly clean up the topic, and update...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/3e6ee7b5e497
revision:	3651:3e6ee7b5e497
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Sun Feb 13 19:20:05 2011 +0100

Properly clean up the topic, and update it on the bookmark when rejoining a chat.

diffs (34 lines):

diff -r 50dc6de6048f -r 3e6ee7b5e497 Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m	Sun Feb 13 01:16:33 2011 +0100
+++ b/Frameworks/Adium Framework/Source/AIChat.m	Sun Feb 13 19:20:05 2011 +0100
@@ -100,6 +100,7 @@
 	[pendingOutgoingContentObjects release];
 	[uniqueChatID release]; uniqueChatID = nil;
 	[customEmoticons release]; customEmoticons = nil;
+	[topic release]; [topicSetter release];
 	
 	[tabStateIcon release]; tabStateIcon = nil;
     [chatCreationInfo release]; chatCreationInfo = nil;
diff -r 50dc6de6048f -r 3e6ee7b5e497 Frameworks/Adium Framework/Source/AIListBookmark.m
--- a/Frameworks/Adium Framework/Source/AIListBookmark.m	Sun Feb 13 01:16:33 2011 +0100
+++ b/Frameworks/Adium Framework/Source/AIListBookmark.m	Sun Feb 13 19:20:05 2011 +0100
@@ -323,6 +323,7 @@
 {
 	if ([self chatIsOurs:chat]) {
 		chat.displayName = self.displayName;
+		[self setStatusMessage:[NSAttributedString stringWithString:([chat valueForProperty:KEY_TOPIC] ?: @"")] notify:NotifyNow];
 	}
 }
 
diff -r 50dc6de6048f -r 3e6ee7b5e497 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Sun Feb 13 01:16:33 2011 +0100
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Sun Feb 13 19:20:05 2011 +0100
@@ -746,7 +746,7 @@
  */
 - (void)updateTopic
 {
-	NSAttributedString *topic = [NSAttributedString stringWithString:([chat valueForProperty:@"Topic"] ?: @"")];
+	NSAttributedString *topic = [NSAttributedString stringWithString:([chat valueForProperty:KEY_TOPIC] ?: @"")];
 	
 	AIContentTopic *contentTopic = [AIContentTopic topicInChat:chat
 													withSource:[chat valueForProperty:KEY_TOPIC_SETTER]