NDHotKeyEvent fixes

.gitignore

@@ -21,4 +21,5 @@ Quicksilver*.dmg
 Quicksilver/SharedSupport/Changes*.html
 Quicksilver/Code-External/VDKQueue
 Quicksilver/Code-External/DisableSubviews
-.idea/
+.idea/
+Quicksilver/Code-External/NDHotKeyEvent

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "Quicksilver/Code-External/LaunchAtLoginController"]
 	path = Quicksilver/Code-External/LaunchAtLoginController
 	url = https://github.com/quicksilver/LaunchAtLoginController.git
+[submodule "Quicksilver/Code-External/NDHotKeyEvent"]
+	path = Quicksilver/Code-External/NDHotKeyEvent
+	url = git://github.com/quicksilver/ndhotkeyevent.git

Quicksilver/Code-App/QSController.m

@@ -18,7 +18,7 @@
 #define DEVEXPIRE 180.0f
 #define DEPEXPIRE 365.24219878f
 
-@interface QSObject (QSURLHandling)
+@interface QSObject (QSURLHandling) <NDHotKeyEventTarget>
 - (void)handleURL:(NSURL *)url;
 @end
 
@@ -61,7 +61,7 @@ + (void)initialize {
 
 	[NSApp registerServicesMenuSendTypes:[NSArray arrayWithObjects:NSStringPboardType, NSRTFPboardType, nil] returnTypes:[NSArray arrayWithObjects:NSStringPboardType, NSRTFPboardType, nil]];
 
-	[NDHotKeyEvent setSignature:'DAED'];
+	[QSHotKeyEvent setSignature:'DAED'];
 
 	[QSVoyeur sharedInstance];
 
@@ -1005,12 +1005,16 @@ - (void)startQuicksilver:(id)sender {
 	[self startDropletConnection];
 }
 
+- (void)hotKeyReleased:(NDHotKeyEvent *)hotKey {
+	[self activateInterface:nil];
+}
+
 - (id)activationHotKey { return nil;  }
 - (void)setActivationHotKey:(id)object {
 	[[QSHotKeyEvent hotKeyWithIdentifier:kActivationHotKey] setEnabled:NO];
 
-	QSHotKeyEvent *activationKey = (QSHotKeyEvent *)[QSHotKeyEvent hotKeyWithDictionary:object];
-	[activationKey setTarget:self selectorReleased:(SEL) 0 selectorPressed:@selector(activateInterface:)];
+	QSHotKeyEvent *activationKey = [QSHotKeyEvent hotKeyWithDictionary:object];
+	[activationKey setTarget:self];
 	[activationKey setIdentifier:kActivationHotKey];
 	[activationKey setEnabled:YES];
 }
@@ -1054,7 +1058,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 		NSInteger modifiers = [oldModifiers unsignedIntegerValue];
 		if (modifiers < (1 << (rightControlKeyBit+1) )) {
 			NSLog(@"updating shortcut %ld", (long)modifiers);
-			[defaults setValue:[NSNumber numberWithInteger:carbonModifierFlagsToCocoaModifierFlags(modifiers)] forKey:kHotKeyModifiers];
+			[defaults setValue:[NSNumber numberWithInteger:NDCocoaModifierFlagsForCarbonModifierFlags(modifiers)] forKey:kHotKeyModifiers];
 			[defaults synchronize];
 		}
 

Quicksilver/Code-App/QSTriggersPrefPane.m

@@ -143,7 +143,7 @@ - (void)populateTypeMenu {
 		[addMenu addItem:groupItem];
 	}
 
-	for (id menuItem in [addMenu itemArray]) {
+	for (NSMenuItem *menuItem in [addMenu itemArray]) {
 		[menuItem setTarget:self];
 		[menuItem setAction:@selector(addTrigger:)];
 	}