adium 3196:1a0cab1132e3: When the user-selected variant is unava...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/1a0cab1132e3
revision:	3196:1a0cab1132e3
author:		mathuaerknedam
date:		Thu May 13 10:54:35 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 9e4ce47edf96 -r 1a0cab1132e3 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Thu May 13 09:05:46 2010 -0600
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Thu May 13 10:54:35 2010 -0500
@@ -368,9 +368,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.
 		 */