adium-1.4 3291:5ff785a3e1da: Don't display this relatively nonse...
commits at adium.im
commits at adium.im
Tue Nov 30 20:55:27 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/5ff785a3e1da
revision: 3291:5ff785a3e1da
author: Evan Schoenberg
date: Wed Nov 24 15:31:02 2010 -0500
Don't display this relatively nonsensical error alert. I've seen and had reports of this happening during application termination. Just return nil.
Subject: adium-1.4 3292:dd1d939811c7: When checking to see if the HTML includes an RTL div, do a case-insensitive search. This check had been broken by changes in AIHTMLDecoder; it's significantly less fragile if case insensitive. Fixes #10403 I believe, though I have not tested it.
details: http://hg.adium.im/adium-1.4/rev/dd1d939811c7
revision: 3292:dd1d939811c7
author: Evan Schoenberg
date: Tue Nov 30 14:53:31 2010 -0600
When checking to see if the HTML includes an RTL div, do a case-insensitive search. This check had been broken by changes in AIHTMLDecoder; it's significantly less fragile if case insensitive. Fixes #10403 I believe, though I have not tested it.
diffs (33 lines):
diff -r 3122b7149fcd -r dd1d939811c7 Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Sat Nov 27 15:09:37 2010 +0100
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Tue Nov 30 14:53:31 2010 -0600
@@ -799,8 +799,10 @@
withString:[NSColor representedColorForObject:contentSource.UID withValidColors:self.validSenderColors]];
//HAX. The odd conditional here detects the rtl html that our html parser spits out.
+ BOOL isRTL = ([inString rangeOfString:@"<div dir=\"rtl\">"
+ options:(NSCaseInsensitiveSearch | NSLiteralSearch)].location != NSNotFound);
[inString replaceKeyword:@"%messageDirection%"
- withString:(([inString rangeOfString:@"<DIV dir=\"rtl\">"].location != NSNotFound) ? @"rtl" : @"ltr")];
+ withString:(isRTL ? @"rtl" : @"ltr")];
//Replaces %time{x}% with a timestamp formatted like x (using NSDateFormatter)
do{
diff -r 3122b7149fcd -r dd1d939811c7 Source/AIInterfaceController.m
--- a/Source/AIInterfaceController.m Sat Nov 27 15:09:37 2010 +0100
+++ b/Source/AIInterfaceController.m Tue Nov 30 14:53:31 2010 -0600
@@ -1218,12 +1218,8 @@
//trap prevents us from crashing if they happen to disable all the available message view plugins.
//PUT THAT PLUGIN BACK IT WAS IMPORTANT!
if ([messageViewArray count] == 0) {
- NSRunCriticalAlertPanel(@"No Message View Plugin Installed",
- @"Adium cannot find its message view plugin. Please re-install. If you've manually disabled Adium's message view plugin, please re-enable it.",
- @"Quit",
- nil,
- nil);
- [NSApp terminate:nil];
+ AILogWithSignature(@"WARNING: Called for %@ without a mesage display controller.", inChat);
+ return nil;
}
return [[messageViewArray objectAtIndex:0] messageDisplayControllerForChat:inChat];
More information about the commits
mailing list