Revision: 3374
http://skim-app.svn.sourceforge.net/skim-app/?rev=3374&view=rev
Author: hofman
Date: 2008-01-16 10:19:31 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
Use more appropriate function to determine if a file is in the trash.
Modified Paths:
--------------
trunk/Files_SKExtensions.m
Modified: trunk/Files_SKExtensions.m
===================================================================
--- trunk/Files_SKExtensions.m 2008-01-14 11:26:07 UTC (rev 3373)
+++ trunk/Files_SKExtensions.m 2008-01-16 18:19:31 UTC (rev 3374)
@@ -72,21 +72,14 @@
BOOL SKFileIsInTrash(NSURL *fileURL) {
NSCParameterAssert([fileURL isFileURL]);
- FSRef parentRef;
- CFURLRef parentURL =
CFURLCreateCopyDeletingLastPathComponent(CFGetAllocator((CFURLRef)fileURL),
(CFURLRef)fileURL);
- [(id)parentURL autorelease];
- if (CFURLGetFSRef(parentURL, &parentRef)) {
- OSStatus err;
- FSRef fsRef;
- err = FSFindFolder(kUserDomain, kTrashFolderType, TRUE, &fsRef);
- if (noErr == err && noErr == FSCompareFSRefs(&fsRef, &parentRef))
- return YES;
-
- err = FSFindFolder(kOnAppropriateDisk, kSystemTrashFolderType, TRUE,
&fsRef);
- if (noErr == err && noErr == FSCompareFSRefs(&fsRef, &parentRef))
- return YES;
+ FSRef fileRef;
+ Boolean result = false;
+ if (CFURLGetFSRef((CFURLRef)fileURL, &fileRef)) {
+ FSDetermineIfRefIsEnclosedByFolder(0, kTrashFolderType, &fileRef,
&result);
+ if (result == false)
+ FSDetermineIfRefIsEnclosedByFolder(0, kSystemTrashFolderType,
&fileRef, &result);
}
- return NO;
+ return result;
}
BOOL SKFileExistsAtPath(NSString *path) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
