Revision: 3934
http://skim-app.svn.sourceforge.net/skim-app/?rev=3934&view=rev
Author: hofman
Date: 2008-05-29 09:11:31 -0700 (Thu, 29 May 2008)
Log Message:
-----------
use carbon folder manager for downloads folder.
Modified Paths:
--------------
trunk/Files_SKExtensions.m
Modified: trunk/Files_SKExtensions.m
===================================================================
--- trunk/Files_SKExtensions.m 2008-05-29 16:02:35 UTC (rev 3933)
+++ trunk/Files_SKExtensions.m 2008-05-29 16:11:31 UTC (rev 3934)
@@ -41,20 +41,19 @@
NSURL *SKDownloadFolderURL() {
- static NSURL *downloadsURL = nil;
+ static CFURLRef downloadsURL = nil;
if (nil == downloadsURL) {
+ OSStatus err;
+ FSRef pathRef;
+
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) {
- NSArray *paths =
NSSearchPathForDirectoriesInDomains(NSDownloadsDirectory, NSUserDomainMask,
YES);
- NSString *path = [paths count] ? [paths objectAtIndex:0] :
[NSHomeDirectory() stringByAppendingPathComponent:@"Downloads"];
- downloadsURL = [[NSURL alloc] initFileURLWithPath:path];
+ err = FSFindFolder(kUserDomain, kDownloadsFolderType, TRUE,
&pathRef);
} else {
- OSStatus err;
ICInstance inst;
ICAttr junk = 0;
ICFileSpec spec;
long size = sizeof(ICFileSpec);
- FSRef pathRef;
err = ICStart(&inst, 'SKim');
if (noErr == err)
@@ -68,12 +67,12 @@
}
err = FSpMakeFSRef(&(spec.fss), &pathRef);
- if(err == noErr)
- downloadsURL = (NSURL
*)CFURLCreateFromFSRef(CFAllocatorGetDefault(), &pathRef);
}
}
+ if(err == noErr)
+ downloadsURL = CFURLCreateFromFSRef(CFAllocatorGetDefault(),
&pathRef);
}
- return downloadsURL;
+ return (NSURL *)downloadsURL;
}
BOOL SKFileIsInTrash(NSURL *fileURL) {
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
