diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-03 00:55:12 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-03 00:55:12 +0400 |
| commit | 5a8cef4a850d3ade331bc507e56ef8cbbdad2ad1 (patch) | |
| tree | 62113cef4e9ea7d13602972dce48a5cd1bd9a2b1 /source/blender/editors/space_file/fsmenu.c | |
| parent | 1930a51f092fdc562616cd15be71170c62b0fb50 (diff) | |
OSX: take back 51826 for now, does not fix dalai's problem
Diffstat (limited to 'source/blender/editors/space_file/fsmenu.c')
| -rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index d3761448a81..a5647c06b92 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -425,23 +425,14 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks) if (err != noErr) continue; - /* Get mounted volumes better method see: */ - /*https://developer.apple.com/library/mac/#documentation/CoreFOundation/Reference/CFURLRef/Reference/reference.html*/ + pathString = CFURLCopyFileSystemPath(cfURL, kCFURLPOSIXPathStyle); - CFURLEnumeratorResult result = kCFURLEnumeratorSuccess; - CFURLEnumeratorRef volEnum = CFURLEnumeratorCreateForMountedVolumes(NULL, kCFURLEnumeratorSkipInvisibles, NULL); + if (!CFStringGetCString(pathString, line, 256, kCFStringEncodingASCII)) + continue; + fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, line, FS_INSERT_SORTED); - while (result != kCFURLEnumeratorEnd) { - unsigned char defPath[FILE_MAX]; - - result = CFURLEnumeratorGetNextURL(volEnum, &cfURL, NULL); - if (result != kCFURLEnumeratorSuccess) - continue; - - CFURLGetFileSystemRepresentation(cfURL, false, (UInt8*)defPath, FILE_MAX); - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, (char *)defPath, FS_INSERT_SORTED); - } - CFRelease(volEnum); + CFRelease(pathString); + CFRelease(cfURL); } CFRelease(pathesArray); |