adium-1.4 2954:c14543e85f96: When the user-selected variant is u...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/c14543e85f96
revision:	2954:c14543e85f96
author:		mathuaerknedam
date:		Thu May 13 10:53:41 2010 -0500

When the user-selected variant is unavailable, fallback to the css for the default variant. Thanks to kbotc for the quick fix! Fixes #13973

diffs (15 lines):

diff -r 2e6c79991712 -r c14543e85f96 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Thu May 13 09:10:40 2010 -0600
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Thu May 13 10:53:41 2010 -0500
@@ -361,9 +361,9 @@
 	NSString *activeVariant;
 	activeVariant = [adium.preferenceController preferenceForKey:[plugin styleSpecificKey:@"Variant" forStyle:activeStyle]
 														   group:preferenceGroup];
-	if (!activeVariant)
+	if (!activeVariant || ![[messageStyle availableVariants] containsObject:activeVariant])
 		activeVariant = [messageStyle defaultVariant];
-	if (!activeVariant) {
+	if (!activeVariant || ![[messageStyle availableVariants] containsObject:activeVariant]) {
 		/* If the message style doesn't specify a default variant, choose the first one.
 		 * Note: Old styles (styleVersion < 3) will always report a variant for defaultVariant.
 		 */