adium 5305:4cdacd04e376: Fix variant CSS loading for mvv<3. Than...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/4cdacd04e376
revision:	5305:4cdacd04e376
branch:		(none)
author:		mathuaerknedam <adium at ei8ht.us>
date:		Tue Feb 12 15:14:29 2013 -0600

Fix variant CSS loading for mvv<3. Thanks to kbotxc for the patch.

diffs (56 lines):

diff -r ed9b7110d6f5 -r 4cdacd04e376 Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Sat Feb 09 23:53:56 2013 -0600
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Tue Feb 12 15:14:29 2013 -0600
@@ -261,13 +261,13 @@
 	if(!checkedSenderColors) {
 		NSURL *url = [NSURL fileURLWithPath:[stylePath stringByAppendingPathComponent:@"Incoming/SenderColors.txt"]];
 		NSString *senderColorsFile = [NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:NULL];
-
+        
 		if(senderColorsFile)
 			validSenderColors = [senderColorsFile componentsSeparatedByString:@":"];
-
+        
 		checkedSenderColors = YES;
 	}
-
+    
 	return validSenderColors;
 }
 
@@ -673,20 +673,25 @@
 
 - (NSString *)pathForVariant:(NSString *)variant
 {
-	//mvv > 2 and (variant exists and not nil)
-	if (styleVersion > 2 && (![variant isEqualToString:[self noVariantName]] && variant != nil )) {
-		return [NSString stringWithFormat:@"Variants/%@.css",variant];
+	if (styleVersion > 2) {
+        //mvv > 2 and (variant exists and not nil)
+        if (![variant isEqualToString:[self noVariantName]] && variant != nil ) {
+            return [NSString stringWithFormat:@"Variants/%@.css",variant];
+        }
+        // mvv > 2 and variant does not exist
+    	else if (([variant isEqualToString:[self noVariantName]] || variant == nil )) {
+            return @"";
+        }
 	}
-	// mvv > 2 and variant does not exist
-	else if (styleVersion > 2 && ([variant isEqualToString:[self noVariantName]] || variant == nil )) {
-		return @"";
-	}
-
-	//Styles before version 3 stored the default variant in main.css, and not in the variants folder.
+    //Styles before version 3 stored the default variant in main.css, and not in the variants folder.
 	else if (styleVersion < 3 && [variant isEqualToString:[self noVariantName]]) {
 		return @"main.css";
 	}
-
+    //Old styles still support varients, so we need to make sure we return them if they exist.
+    else if (variant != nil) {
+        return [NSString stringWithFormat:@"Variants/%@.css",variant];
+    }
+    
 	// Secure Return
 	return @"";
 }