Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ml #465

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ml #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de678fc
disable some actions that won't compile under ML
Jun 20, 2012
af9a7fb
update JSONKit
Jun 20, 2012
cd05cda
enables developer ID (code signing)
Jun 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions ControlPlane.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
8D232FB60BD9D507006A3963 /* RulesPrefs.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D232FB40BD9D507006A3963 /* RulesPrefs.png */; };
8D27ECB00C4456A300AE1929 /* AudioOutputEvidenceSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D27ECAE0C4456A300AE1929 /* AudioOutputEvidenceSource.m */; };
8D2BAAAD0C56E26200A50777 /* NetworkLinkEvidenceSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D2BAAAB0C56E26100A50777 /* NetworkLinkEvidenceSource.m */; };
8D3453C40C18E5C1006011D0 /* IChatAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D3453C20C18E5C1006011D0 /* IChatAction.m */; };
8D38B66C0C49D50200290F47 /* SliderWithValue.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D38B66A0C49D50200290F47 /* SliderWithValue.m */; };
8D3A3D5F0C012565008EBF2A /* EvidenceSourcesPrefs.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D3A3D5E0C012564008EBF2A /* EvidenceSourcesPrefs.png */; };
8D3BFF3F0C61BE4500B9B910 /* AboutPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D3BFF3D0C61BE4500B9B910 /* AboutPanel.m */; };
Expand Down Expand Up @@ -140,7 +139,6 @@
DD8274F91411748C0098FA6E /* LockKeychainAction.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8274F81411748B0098FA6E /* LockKeychainAction.m */; };
DD8274FB141177750098FA6E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD8274FA141177750098FA6E /* Security.framework */; };
DD8274FE14117C590098FA6E /* SpeakAction.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8274FD14117C580098FA6E /* SpeakAction.m */; };
DD827507141188890098FA6E /* DisplayBrightnessAction.m in Sources */ = {isa = PBXBuildFile; fileRef = DD827506141188880098FA6E /* DisplayBrightnessAction.m */; };
DDA2013A1411C0FB00DE570E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DDA2013C1411C0FB00DE570E /* Localizable.strings */; };
DDA201441411C25A00DE570E /* GenericRule.xib in Resources */ = {isa = PBXBuildFile; fileRef = DDA201461411C25A00DE570E /* GenericRule.xib */; };
DDA2014E1411C32F00DE570E /* IPRule.xib in Resources */ = {isa = PBXBuildFile; fileRef = DDA201501411C32F00DE570E /* IPRule.xib */; };
Expand Down Expand Up @@ -1223,7 +1221,6 @@
8DC4E8000C17891D007E7E41 /* MailSMTPServerAction.m in Sources */,
8D71CAEF0C17BA7900E56526 /* ToggleableAction.m in Sources */,
8D71CB790C17C01700E56526 /* ScreenSaverPasswordAction.m in Sources */,
8D3453C40C18E5C1006011D0 /* IChatAction.m in Sources */,
8DCBE96C0C1A7ECE008260EF /* MountAction.m in Sources */,
8D8155D00C3A304E00228463 /* ContextsDataSource.m in Sources */,
8D6762170C3B8D8D000B63EC /* NetworkLocationAction.m in Sources */,
Expand Down Expand Up @@ -1261,7 +1258,6 @@
DD8274F614116CC90098FA6E /* OpenURLAction.m in Sources */,
DD8274F91411748C0098FA6E /* LockKeychainAction.m in Sources */,
DD8274FE14117C590098FA6E /* SpeakAction.m in Sources */,
DD827507141188890098FA6E /* DisplayBrightnessAction.m in Sources */,
DDDF1C2B1411D49300DB0018 /* DefaultBrowserAction.m in Sources */,
DDDF1C2F1411E08000DB0018 /* ITunesPlaylistAction.m in Sources */,
DA5B01F31412BAEC00E19C50 /* BetterAuthorizationSampleLib.c in Sources */,
Expand Down Expand Up @@ -1470,7 +1466,7 @@
"\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx10.7;
SDKROOT = macosx10.8;
};
name = Debug;
};
Expand All @@ -1484,7 +1480,7 @@
"\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx10.7;
SDKROOT = macosx10.8;
STRIP_INSTALLED_PRODUCT = YES;
};
name = Release;
Expand All @@ -1494,7 +1490,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CODE_SIGN_IDENTITY = "";
CODE_SIGN_IDENTITY = "Developer ID Application: Dustin Rue";
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1538,6 +1534,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = ControlPlane;
PROVISIONING_PROFILE = "";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx10.7;
VALIDATE_PRODUCT = YES;
Expand All @@ -1549,7 +1546,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CODE_SIGN_IDENTITY = "";
CODE_SIGN_IDENTITY = "Developer ID Application: Dustin Rue";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -1591,6 +1588,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = ControlPlane;
PROVISIONING_PROFILE = "";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx10.7;
VALIDATE_PRODUCT = YES;
Expand All @@ -1602,31 +1600,31 @@
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.7;
SDKROOT = macosx10.8;
};
name = Debug;
};
DA5B01E01412B6A700E19C50 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.7;
SDKROOT = macosx10.8;
};
name = Release;
};
DA5B02031412BB1800E19C50 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.7;
SDKROOT = macosx10.8;
};
name = Debug;
};
DA5B02041412BB1800E19C50 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.7;
SDKROOT = macosx10.8;
};
name = Release;
};
Expand Down
15 changes: 8 additions & 7 deletions Source/Action.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,10 @@ - (NSArray *)executeAppleScriptReturningListOfStrings:(NSString *)script
#import "DefaultBrowserAction.h"
#import "DefaultPrinterAction.h"
#import "DesktopBackgroundAction.h"
#import "DisplayBrightnessAction.h"
//#import "DisplayBrightnessAction.h"
#import "DisplaySleepTimeAction.h"
#import "FirewallRuleAction.h"
#import "IChatAction.h"
//#import "IChatAction.h"
#import "ITunesPlaylistAction.h"
#import "LockKeychainAction.h"
#import "MailIMAPServerAction.h"
Expand Down Expand Up @@ -274,9 +274,9 @@ - (id)init
[DefaultBrowserAction class],
[DefaultPrinterAction class],
[DesktopBackgroundAction class],
[DisplayBrightnessAction class],
//[DisplayBrightnessAction class],
[DisplaySleepTimeAction class],
[IChatAction class],
//[IChatAction class],
[ITunesPlaylistAction class],
[LockKeychainAction class],
[MailIMAPServerAction class],
Expand Down Expand Up @@ -316,8 +316,8 @@ - (id)init
NSLocalizedString(@"DefaultBrowser", @"Action type");
NSLocalizedString(@"DefaultPrinter", @"Action type");
NSLocalizedString(@"DesktopBackground", @"Action type");
NSLocalizedString(@"DisplayBrightness", @"Action type");
NSLocalizedString(@"iChat", @"Action type");
//NSLocalizedString(@"DisplayBrightness", @"Action type");
//NSLocalizedString(@"iChat", @"Action type");
NSLocalizedString(@"iTunesPlaylist", @"Action type");
NSLocalizedString(@"LockKeychain", @"Action type");
NSLocalizedString(@"MailIMAPServer", @"Action type");
Expand Down Expand Up @@ -346,13 +346,14 @@ - (id)init
NSLocalizedString(@"Unmount", @"Action type");
NSLocalizedString(@"VPN", @"Action type");
}

/*
// hack to remove the DisplayBrightnessAction on ML
if (major == 10 && minor > 7) {
NSMutableArray *tmp = [classes mutableCopy];
[tmp removeObject:[DisplayBrightnessAction class]];
classes = tmp;
}
*/

if (major == 10 && minor < 7) {
NSMutableArray *tmp = [classes mutableCopy];
Expand Down
Loading