adium 4336:9fea67859bc8: More message view tweaks. Fix a deadloc...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/9fea67859bc8
revision:	4336:9fea67859bc8
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Thu Dec 01 15:29:17 2011 -0800

More message view tweaks. Fix a deadlock. Refs #15377.
Subject: adium 4337:cec54e94f10e: Patch from kbotc fixing emotes in IRC private messages. Fixes #15589

details:	http://hg.adium.im/adium/rev/cec54e94f10e
revision:	4337:cec54e94f10e
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Thu Dec 01 15:29:37 2011 -0800

Patch from kbotc fixing emotes in IRC private messages. Fixes #15589
Subject: adium 4338:8777972e1760: Patch form kbotc fixing global shortcuts. Fixes #12013.

details:	http://hg.adium.im/adium/rev/8777972e1760
revision:	4338:8777972e1760
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Thu Dec 01 15:31:20 2011 -0800

Patch form kbotc fixing global shortcuts. Fixes #12013.

diffs (64 lines):

diff -r e25448d743b3 -r 8777972e1760 Frameworks/ShortcutRecorder/Source/SRRecorderCell.m
--- a/Frameworks/ShortcutRecorder/Source/SRRecorderCell.m	Thu Dec 01 13:21:59 2011 -0800
+++ b/Frameworks/ShortcutRecorder/Source/SRRecorderCell.m	Thu Dec 01 15:31:20 2011 -0800
@@ -1067,6 +1067,7 @@
 		
 	NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
 	[notificationCenter addObserver:self selector:@selector(_createGradient) name:NSSystemColorsDidChangeNotification object:nil]; // recreate gradient if needed
+	[self setAutosaveName:@"RecorderCell"];
 	[self _createGradient];
 
 	[self _loadKeyCombo];
diff -r e25448d743b3 -r 8777972e1760 Plugins/Purple Service/ESIRCAccount.m
--- a/Plugins/Purple Service/ESIRCAccount.m	Thu Dec 01 13:21:59 2011 -0800
+++ b/Plugins/Purple Service/ESIRCAccount.m	Thu Dec 01 15:31:20 2011 -0800
@@ -201,7 +201,9 @@
 	if (!didCommand || hasSlashMe) {
 		if (hasSlashMe) {
 			inContentMessage.sendContent = NO;
-			inContentMessage.displayContent = NO;
+			if (inContentMessage.chat.isGroupChat) {
+				inContentMessage.displayContent = NO;
+			}
 		}
 		/* If we're sending a message on an encrypted direct msg, we can encode the HTML normally, as links will go through fine.
 		 * However, in all other cases, IRC will drop the title of any link, so we preprocess it to be in the form "title (link)"
diff -r e25448d743b3 -r 8777972e1760 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Thu Dec 01 13:21:59 2011 -0800
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Thu Dec 01 15:31:20 2011 -0800
@@ -296,9 +296,7 @@
 			    ![key isEqualToString:[plugin styleSpecificKey:@"BackgroundCachePath" forStyle:activeStyle]] &&
 				(![key isEqualToString:KEY_CURRENT_WEBKIT_STYLE_PATH] || shouldReflectPreferenceChanges)) {
 				if (!isUpdatingWebViewForCurrentPreferences) {
-					isUpdatingWebViewForCurrentPreferences = YES;
 					[self _updateWebViewForCurrentPreferences];
-					isUpdatingWebViewForCurrentPreferences = NO;
 				}
 			}
 		}
@@ -311,9 +309,7 @@
 											 forKey:[plugin styleSpecificKey:@"BackgroundCachePath" forStyle:activeStyle]
 											  group:preferenceGroup];	
 		if (!isUpdatingWebViewForCurrentPreferences) {
-			isUpdatingWebViewForCurrentPreferences = YES;
 			[self _updateWebViewForCurrentPreferences];
-			isUpdatingWebViewForCurrentPreferences = NO;
 		}
 	}	
 }
@@ -358,6 +354,7 @@
 		webViewUpdateQueue = dispatch_queue_create("im.adium.AIWebKitMessageViewController.webViewUpdateQueue", 0);
 	});
 	
+	isUpdatingWebViewForCurrentPreferences = YES;
 	dispatch_sync(webViewUpdateQueue, ^{
 		NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 		//Cleanup first
@@ -470,6 +467,7 @@
 		//Prime the webview with the new style/variant and settings, and re-insert all our content back into the view
 		[self _primeWebViewAndReprocessContent:YES];
 		[pool release];
+		isUpdatingWebViewForCurrentPreferences = NO;
 	});
 }