adium 2507:89182b77f6ad: Patch from mathuaerknedam, fixes #12448
commits at adium.im
commits at adium.im
Sat Jun 20 22:22:54 UTC 2009
details: http://hg.adium.im/adium/rev/89182b77f6ad
revision: 2507:89182b77f6ad
author: David Smith <catfish.man at gmail.com>
date: Sat Jun 20 15:22:47 2009 -0700
Patch from mathuaerknedam, fixes #12448
diffs (23 lines):
diff -r ef0c39fdfdaf -r 89182b77f6ad Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Sat Jun 20 12:28:51 2009 -0700
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Sat Jun 20 15:22:47 2009 -0700
@@ -497,6 +497,9 @@
contextOutHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Context" ofType:@"html" inDirectory:@"Outgoing"]] retain];
nextContextOutHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContext" ofType:@"html" inDirectory:@"Outgoing"]] retain];
+ //Fall back to Resources/Content.html if Incoming isn't present
+ if (!contentInHTML) contentInHTML = [contentHTML retain];
+
//Fall back to Content if NextContent doesn't need to use different HTML
if (!nextContentInHTML) nextContentInHTML = [contentInHTML retain];
@@ -516,9 +519,6 @@
if (!contentOutHTML) contentOutHTML = [contentInHTML retain];
if (!nextContentOutHTML) nextContentOutHTML = [nextContentInHTML retain];
- //Fall back to Resources/Content.html if Incoming isn't present
- if (!contentInHTML) contentInHTML = [contentHTML retain];
-
//Status
statusHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Status" ofType:@"html"]] retain];
More information about the commits
mailing list