Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 448592 - Add CamiTools to the 'problematic add-ons' list. Patch by Chris Lawson <cl-bugs-new@chrislawson.net>, r=smorgan, sr=pink

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@254895 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alqahira%ardisson.org
2008-11-06 00:09:37 +00:00
parent e356b37706
commit 2a5591a8eb
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/camino/src/application/MainController.mm
View File

@@ -571,6 +571,22 @@ NSString* const kPreviousSessionTerminatedNormallyKey = @"PreviousSessionTermina
if (NSClassFromString(className))
[addOnsPresent addObject:[problemAddOns objectForKey:className]];
}
// Check for CamiTools by path, since it's a preference pane rather than an InputManager.
NSString* userPreferencePanesPath = [[prefManager profilePath] stringByAppendingPathComponent:@"PreferencePanes"];
NSString* globalPreferencePanesPath = @"/Library/Application Support/Camino/PreferencePanes";
NSFileManager* fileManager = [NSFileManager defaultManager];
NSArray* installedUserPreferencePanes = [fileManager directoryContentsAtPath:userPreferencePanesPath];
NSArray* installedGlobalPreferencePanes = [fileManager directoryContentsAtPath:globalPreferencePanesPath];
NSMutableArray* installedPreferencePanes = [NSMutableArray array];
[installedPreferencePanes addObjectsFromArray:installedUserPreferencePanes];
[installedPreferencePanes addObjectsFromArray:installedGlobalPreferencePanes];
NSEnumerator* prefPaneEnumerator = [installedPreferencePanes objectEnumerator];
NSString* paneName;
while ((paneName = [prefPaneEnumerator nextObject])) {
if ([paneName rangeOfString:@"CamiTools" options:NSCaseInsensitiveSearch].location != NSNotFound)
[addOnsPresent addObject:@"CamiTools"];
}
if ([addOnsPresent count] > 0) {
NSString* warningText =
[NSString stringWithFormat:NSLocalizedString(@"ProblematicAddOnWarningMessage", nil),