Patch [#22339] File/installation paths changes

Patch Tracker: http://projects.blender.org/tracker/?func=detail&aid=22339&group_id=9&atid=127

This patch implements the proposal outlined here:
http://wiki.blender.org/index.php/Dev:2.5/Source/Installation/Proposal

Original patch by Matt Ebb.
Contributions by Nathan Letwory, Damien Plisson and Andrea Weikert

NOTE:
This is a work in progress commit, some work still needs to be done on the SCons and CMake files for this to work properly, but at least should compile and the files should be created in the right directory.

Commit discussed on IRC with Ton and Campbell.

1 files changed, 32 insertions, 24 deletions

diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 08a6b5a8f34..a7d6288c3c9 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -248,7 +248,37 @@ void fsmenu_write_file(struct FSMenu* fsmenu, const char *filename)
 	fclose(fp);
 }
 
-void fsmenu_read_file(struct FSMenu* fsmenu, const char *filename)
+void fsmenu_read_bookmarks(struct FSMenu* fsmenu, const char *filename)
+{
+	char line[256];
+	FSMenuCategory category = FS_CATEGORY_BOOKMARKS;
+	FILE *fp;
+
+	fp = fopen(filename, "r");
+	if (!fp) return;
+
+	while ( fgets ( line, 256, fp ) != NULL ) /* read a line */
+	{
+		if (strncmp(line, "[Bookmarks]", 11)==0){
+			category = FS_CATEGORY_BOOKMARKS;
+		} else if (strncmp(line, "[Recent]", 8)==0){
+			category = FS_CATEGORY_RECENT;
+		} else {
+			int len = strlen(line);
+			if (len>0) {
+				if (line[len-1] == '\n') {
+					line[len-1] = '\0';
+				}
+				if (BLI_exist(line)) {
+					fsmenu_insert_entry(fsmenu, category, line, 0, 1);
+				}
+			}
+		}
+	}
+	fclose(fp);
+}
+
+void fsmenu_read_system(struct FSMenu* fsmenu)
 {
 	char line[256];
 	FSMenuCategory category = FS_CATEGORY_BOOKMARKS;
@@ -482,31 +512,9 @@ void fsmenu_read_file(struct FSMenu* fsmenu, const char *filename)
 	}
 #endif
 #endif
-
-	fp = fopen(filename, "r");
-	if (!fp) return;
-
-	while ( fgets ( line, 256, fp ) != NULL ) /* read a line */
-	{
-		if (strncmp(line, "[Bookmarks]", 11)==0){
-			category = FS_CATEGORY_BOOKMARKS;
-		} else if (strncmp(line, "[Recent]", 8)==0){
-			category = FS_CATEGORY_RECENT;
-		} else {
-			int len = strlen(line);
-			if (len>0) {
-				if (line[len-1] == '\n') {
-					line[len-1] = '\0';
-				}
-				if (BLI_exist(line)) {
-					fsmenu_insert_entry(fsmenu, category, line, 0, 1);
-				}
-			}
-		}
-	}
-	fclose(fp);
 }
 
+
 static void fsmenu_free_category(struct FSMenu* fsmenu, FSMenuCategory category)
 {
 	FSMenuEntry *fsme= fsmenu_get_category(fsmenu, category);