adium-1.4 3275:49636b57895e: Only display focus indicators withi...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/49636b57895e
revision:	3275:49636b57895e
author:		Evan Schoenberg
date:		Tue Nov 16 20:06:55 2010 -0600

Only display focus indicators within the message view itself for group chats. All chats will still have marked scrollers for focus (and mention) purposes.
Subject: adium-1.4 3276:630cd8e9fc98: Merge conflict resolution

details:	http://hg.adium.im/adium-1.4/rev/630cd8e9fc98
revision:	3276:630cd8e9fc98
author:		Evan Schoenberg
date:		Tue Nov 16 20:09:29 2010 -0600

Merge conflict resolution

diffs (38 lines):

diff -r bcd92ff5bdf8 -r 630cd8e9fc98 Plists/Info.plist
--- a/Plists/Info.plist	Tue Nov 16 12:40:04 2010 +0100
+++ b/Plists/Info.plist	Tue Nov 16 20:09:29 2010 -0600
@@ -469,7 +469,11 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
+<<<<<<< local
+	<string>1.4.1</string>
+=======
 	<string>1.4.2hg</string>
+>>>>>>> other
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5.8</string>
 	<key>LSRequiresNativeExecution</key>
diff -r bcd92ff5bdf8 -r 630cd8e9fc98 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Tue Nov 16 12:40:04 2010 +0100
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Tue Nov 16 20:09:29 2010 -0600
@@ -692,14 +692,16 @@
 			if (nextMessageFocus) {
 				[self.markedScroller addMarkAt:[self.currentOffsetHeight integerValue] withIdentifier:@"focus" withColor:[NSColor redColor]];
 				
-				// Add a class for "first content to lose focus"
-				[content addDisplayClass:@"firstFocus"];
+				// Add a class for "first content to lose focus" if this is a group chat
+				if (content.chat.isGroupChat)
+					[content addDisplayClass:@"firstFocus"];
 				
 				nextMessageFocus = NO;
 			}
 
 			// Add a class for "this content received while out of focus"
-			[content addDisplayClass:@"focus"];
+			if (content.chat.isGroupChat)
+				[content addDisplayClass:@"focus"];
 		}
 		
 		//Add the content object