adium-1.4 3315:3407a972ab31: For Growl notifcations of group cha...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/3407a972ab31
revision:	3315:3407a972ab31
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Dec 20 21:04:16 2010 +0100

For Growl notifcations of group chat messages, put the channel name after the nick, instead of in front of the message.

Makes it easier to get all the important information from a notification at first glance.
(transplanted from 9ff6f82fc91506a561a8d87ae02b1d6448c6aac6)
Subject: adium-1.4 3316:77ef2aa43ba9: Fix rather redundant statement after previous commit.

details:	http://hg.adium.im/adium-1.4/rev/77ef2aa43ba9
revision:	3316:77ef2aa43ba9
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Dec 20 22:12:08 2010 +0100

Fix rather redundant statement after previous commit.
(transplanted from 5f0d4b59d99f1aa6e0b79b1273cf309019af3c43)

diffs (30 lines):

diff -r 6fdac6392065 -r 77ef2aa43ba9 Source/AdiumMessageEvents.m
--- a/Source/AdiumMessageEvents.m	Sat Dec 18 23:10:30 2010 -0800
+++ b/Source/AdiumMessageEvents.m	Mon Dec 20 22:12:08 2010 +0100
@@ -346,11 +346,7 @@
 		
 	} else {
 		if (messageText && [messageText length]) {
-			if (contentObject.chat.isGroupChat) {
-				description = [NSString stringWithFormat:@"(%@) %@", contentObject.chat.displayName, messageText];
-			} else {
-				description = messageText;
-			}
+			description = messageText;
 		} else {
 			if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED] ||
 				[eventID isEqualToString:CONTENT_MESSAGE_RECEIVED_FIRST] ||
diff -r 6fdac6392065 -r 77ef2aa43ba9 Source/NEHGrowlPlugin.m
--- a/Source/NEHGrowlPlugin.m	Sat Dec 18 23:10:30 2010 -0800
+++ b/Source/NEHGrowlPlugin.m	Mon Dec 20 22:12:08 2010 +0100
@@ -391,6 +391,10 @@
 			[clickContext setObject:chat.uniqueChatID
 							 forKey:KEY_CHAT_ID];
 			
+		if (chat && [chat isGroupChat]) {
+			title = [NSString stringWithFormat:@"%@ (%@)", title, [chat displayName]];
+		}
+			
 		} else {
 			if ([userInfo isKindOfClass:[ESFileTransfer class]] &&
 				[eventID isEqualToString:FILE_TRANSFER_COMPLETE]) {