Merge pull request #1430 from pjrobertson/uti

Fixes for UTI file types fixes #1428, #1427
quicksilver · Mar 20, 2013 · 531c563 · 531c563
2 parents f70add9 + 11f300a
commit 531c563
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m b/Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m
@@ -633,7 +633,7 @@ - (NSDictionary *)infoRecord {
         return nil;
     }
 
-	NSString *uti = QSUTIForExtensionOrType((NSString *)record.extension, record.filetype);
+	NSString *uti = QSUTIWithLSInfoRec(path, &record);
     NSString *extension = [(NSString *)record.extension copy];
 
     /* local or network volume? does it support Trash? */

diff --git a/Quicksilver/Code-QuickStepFoundation/QSUTI.m b/Quicksilver/Code-QuickStepFoundation/QSUTI.m
@@ -68,9 +68,11 @@
 	return itemUTI;
 }
 
+
+// WARNING: This does not necessarily return the correct UTI. QSUTIWithLSInfoRec() is more reliable
 NSString *QSUTIForExtensionOrType(NSString *extension, OSType filetype) {
 	NSString *itemUTI = nil;
-//	NSLog(@"type %@ %@", extension, NSFileTypeForHFSTypeCode(filetype));
+
 	if (extension != nil) {
 		itemUTI = (NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (CFStringRef)extension, NULL);
 	} else {