Merge pull request #384 from pjrobertson/iObjectActionsFix

Fixed iObject actions showing for dObject when closing/reopening QS
quicksilver · Jun 17, 2011 · 47e99b7 · 47e99b7
2 parents 256980f + 8714487
commit 47e99b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
diff --git a/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m b/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m
@@ -278,7 +278,7 @@ - (NSArray *)rankedActions {
         dObject = [dObject object];
 
     if([iObject isKindOfClass:[QSRankedObject class]])
-        dObject = [iObject object];
+        iObject = [iObject object];
 
 	return [QSExec rankedActionsForDirectObject:dObject indirectObject:iObject];
 }

diff --git a/Quicksilver/PlugIns-Main/QSCorePlugIn/QSCorePlugIn-Info.plist b/Quicksilver/PlugIns-Main/QSCorePlugIn/QSCorePlugIn-Info.plist
@@ -338,6 +338,8 @@
 			<string>FSActions</string>
 			<key>actionSelector</key>
 			<string>getFilePaths:</string>
+			<key>alternateAction</key>
+			<string>FileGetPosixPathAction</string>
 			<key>directTypes</key>
 			<array>
 				<string>NSFilenamesPboardType</string>
@@ -350,8 +352,6 @@
 			<integer>1</integer>
 			<key>precedence</key>
 			<real>-0.5</real>
-			<key>alternateAction</key>
-			<string>FileGetPosixPathAction</string>
 		</dict>
 		<key>FileGetPosixPathAction</key>
 		<dict>
@@ -1231,37 +1231,6 @@
 					<key>source</key>
 					<string>QSFileSystemObjectSource</string>
 				</dict>
-				<dict>
-					<key>ID</key>
-					<string>QSPresetClassicApplications</string>
-					<key>name</key>
-					<string>Applications (Mac OS 9)</string>
-					<key>requiresSettingsPath</key>
-					<true/>
-					<key>settings</key>
-					<dict>
-						<key>folderDepth</key>
-						<integer>2</integer>
-						<key>folderTypes</key>
-						<array>
-							<string>com.apple.application</string>
-						</array>
-						<key>kind</key>
-						<string>Folder</string>
-						<key>parser</key>
-						<string>QSDirectoryParser</string>
-						<key>path</key>
-						<string>/Applications (Mac OS 9)/</string>
-						<key>scanContents</key>
-						<integer>0</integer>
-						<key>skipItem</key>
-						<integer>1</integer>
-					</dict>
-					<key>source</key>
-					<string>QSFileSystemObjectSource</string>
-					<key>watchTarget</key>
-					<true/>
-				</dict>
 				<dict>
 					<key>ID</key>
 					<string>QSPresetUserApplications</string>