[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51827] trunk/blender/source/blender/ editors/space_file/fsmenu.c: OSX: take back 51826 for now, does not fix dalai's problem

[jens verwiebe]

Revision: 51827
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51827
Author:   jensverwiebe
Date:     2012-11-02 20:55:12 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
OSX: take back 51826 for now, does not fix dalai's problem

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/fsmenu.c

Modified: trunk/blender/source/blender/editors/space_file/fsmenu.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/fsmenu.c	2012-11-02 20:26:37 UTC (rev 51826)
+++ trunk/blender/source/blender/editors/space_file/fsmenu.c	2012-11-02 20:55:12 UTC (rev 51827)
@@ -425,23 +425,14 @@
 			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);