adium 2562:046556e5b77c: Patch from wildwobbly: Fixes variable t...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/046556e5b77c
revision:	2562:046556e5b77c
author:		Evan Schoenberg
date:		Mon Jul 27 18:26:01 2009 -0500

Patch from wildwobbly: Fixes variable that is assigned and declared, only to be reassigned a few lines down. Removed first line, redeclared at first actual use of variable.

Thanks! Fixes #12460
Subject: adium 2563:652e28772160: Patch from wildwobby to fix dead assignment in RBSplitView.m. Fixes #12459. Thanks!

details:	http://hg.adium.im/adium/rev/652e28772160
revision:	2563:652e28772160
author:		Evan Schoenberg
date:		Mon Jul 27 18:27:09 2009 -0500

Patch from wildwobby to fix dead assignment in RBSplitView.m. Fixes #12459. Thanks!
Subject: adium 2564:879cd64c4004: Patch from mathuaerknedam to fix `%serviceIconImg%` and add a tooltip to it. Fixes #12664. Thanks!

details:	http://hg.adium.im/adium/rev/879cd64c4004
revision:	2564:879cd64c4004
author:		Evan Schoenberg
date:		Mon Jul 27 18:29:20 2009 -0500

Patch from mathuaerknedam to fix `%serviceIconImg%` and add a tooltip to it. Fixes #12664. Thanks!
Subject: adium 2565:bf1f209eea72: Patch from '''mathuaerknedam''' which adds a message style keyword `%userIcons%` which is replaced by `showIcons` if user icons are enabled in the Messages preferences and `hideIcons` if they aren't. This lets him do some CSS voodoo of some sort :) Fixes #11874

details:	http://hg.adium.im/adium/rev/bf1f209eea72
revision:	2565:bf1f209eea72
author:		Evan Schoenberg
date:		Mon Jul 27 18:32:06 2009 -0500

Patch from '''mathuaerknedam''' which adds a message style keyword `%userIcons%` which is replaced by `showIcons` if user icons are enabled in the Messages preferences and `hideIcons` if they aren't. This lets him do some CSS voodoo of some sort :) Fixes #11874

diffs (53 lines):

diff -r 924fa8c66a31 -r bf1f209eea72 Frameworks/RBSplitView/Source/RBSplitSubview.m
--- a/Frameworks/RBSplitView/Source/RBSplitSubview.m	Mon Jul 27 16:52:23 2009 -0500
+++ b/Frameworks/RBSplitView/Source/RBSplitSubview.m	Mon Jul 27 18:32:06 2009 -0500
@@ -684,7 +684,6 @@
 		BOOL ishor = [sv isHorizontal];
 // Continuing animation only makes sense if we still have at least FRAMETIME available.
 		if (remain>=FRAMETIME) {
-			float dim = DIM(frame.size);
 			float avg = anim->elapsedTime;
 // We try to keep a record of how long it takes, on the average, to resize and adjust
 // one animation frame.
@@ -693,7 +692,7 @@
 			}
 			NSTimeInterval delay = MIN(0.0,FRAMETIME-avg);
 // We adjust the new dimension proportionally to how much of the designated time has passed.
-			dim = floorf(anim->dimension*(remain-avg)/anim->totalTime);
+			float dim = floorf(anim->dimension*(remain-avg)/anim->totalTime);
 			if (dim>4.0) {
 				if (!anim->collapsing) {
 					dim = anim->dimension-dim;
diff -r 924fa8c66a31 -r bf1f209eea72 Frameworks/RBSplitView/Source/RBSplitView.m
--- a/Frameworks/RBSplitView/Source/RBSplitView.m	Mon Jul 27 16:52:23 2009 -0500
+++ b/Frameworks/RBSplitView/Source/RBSplitView.m	Mon Jul 27 18:32:06 2009 -0500
@@ -1649,7 +1649,6 @@
 	RBSplitSubview* last = nil;
 // And we make a note if there's any nested RBSplitView.
 	NSInteger nested = NSNotFound;
-	newsize = DIM(bounds.size)-divcount*divt;
 	for (i=0;i<subcount;i++) {
 		curr = &caches[i];
 // If we have a nested split view store its index.
diff -r 924fa8c66a31 -r bf1f209eea72 Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Mon Jul 27 16:52:23 2009 -0500
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Mon Jul 27 18:32:06 2009 -0500
@@ -777,6 +777,9 @@
 		}
 	} while (range.location != NSNotFound);
 
+	[inString replaceKeyword:@"%userIcons%"
+				  withString:(showUserIcons ? @"showIcons" : @"hideIcons")];
+
 	[inString replaceKeyword:@"%messageClasses%"
 				  withString:[(contentIsSimilar ? @"consecutive " : @"") stringByAppendingString:[[content displayClasses] componentsJoinedByString:@" "]]];
 	
@@ -1161,7 +1164,7 @@
 	NSString *serviceIconPath = [AIServiceIcons pathForServiceIconForServiceID:account.service.serviceID
 																		  type:AIServiceIconLarge];
 	
-	NSString *serviceIconTag = [NSString stringWithFormat:@"<img class=\"serviceIcon\" src=\"@\" alt=\"%@\">", serviceIconPath ? serviceIconPath : @"outgoing_icon.png", [account.service shortDescription]];
+	NSString *serviceIconTag = [NSString stringWithFormat:@"<img class=\"serviceIcon\" src=\"%@\" alt=\"%@\" title=\"%@\">", serviceIconPath ? serviceIconPath : @"outgoing_icon.png", [account.service shortDescription], [account.service shortDescription]];
 	
 	[inString replaceKeyword:@"%serviceIconImg%"
 				  withString:serviceIconTag];