adium-1.4 3482:540e80856993: Enable the %service% keyword in the...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/540e80856993
revision:	3482:540e80856993
branch:		(none)
author:		mathuaerknedam
date:		Tue May 03 12:42:07 2011 -0500

Enable the %service% keyword in the header.
(transplanted from 0ca7ab686bcff321dadf2296e91075ab21841393)

diffs (24 lines):

diff -r b6b99b09738b -r 540e80856993 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Wed Apr 27 15:22:56 2011 -0400
+++ b/ChangeLogs/Changes.txt	Tue May 03 12:42:07 2011 -0500
@@ -16,6 +16,7 @@
 
  Message View
   * Only display focus indication for group chats. (#14420)
+  * Enable %service% keyword in header.
   * Fixed issue where sections of conversations loaded from message history are repeated. (#13362)
   * Fixed iChat emoticons in Snow Leopard on case-sensitive file systems. (#14936)
   * minimal_mod
diff -r b6b99b09738b -r 540e80856993 Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Wed Apr 27 15:22:56 2011 -0400
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Tue May 03 12:42:07 2011 -0500
@@ -1227,6 +1227,9 @@
 	
 	NSString *serviceIconTag = [NSString stringWithFormat:@"<img class=\"serviceIcon\" src=\"%@\" alt=\"%@\" title=\"%@\">", serviceIconPath ? serviceIconPath : @"outgoing_icon.png", [account.service shortDescription], [account.service shortDescription]];
 	
+	[inString replaceKeyword:@"%service%" 
+				  withString:[account.service shortDescription]];
+	
 	[inString replaceKeyword:@"%serviceIconImg%"
 				  withString:serviceIconTag];