Quick name change to protect the innocent.

[winterboard.git] / Application.mm

diff --git a/Application.mm b/Application.mm
index 2e129d75c7d9a64052b74e51d9701af77a8649b4..a7c72ad0696a47c9ae996fca57123316e37e6440 100644 (file)
--- a/Application.mm
+++ b/Application.mm
@@ -47,7 +47,7 @@
 > {
     UIWindow *window_;
     UITableView *themesTable_;
 > {
     UIWindow *window_;
     UITableView *themesTable_;

-    NSArray *themesArray_;
+    NSMutableArray *themesArray_;

 }
 
 @end
 }
 
 @end


@@ -90,8 +90,11 @@
     window_ = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].applicationFrame];
     [window_ makeKeyAndVisible];
 
     window_ = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].applicationFrame];
     [window_ makeKeyAndVisible];
 

+    themesArray_ = [[NSMutableArray arrayWithCapacity:32] retain];

     NSFileManager *manager = [NSFileManager defaultManager];
     NSFileManager *manager = [NSFileManager defaultManager];

-    themesArray_ = [[manager contentsOfDirectoryAtPath:@"/Library/Themes" error:nil] retain];
+
+    [themesArray_ addObjectsFromArray:[manager contentsOfDirectoryAtPath:@"/Library/Themes" error:NULL]];
+    [themesArray_ addObjectsFromArray:[manager contentsOfDirectoryAtPath:[NSString stringWithFormat:@"%@/Library/SummerBoard/Themes", NSHomeDirectory()] error:NULL]];

 
     themesTable_ = [[UITableView alloc] initWithFrame:window_.bounds];
     [window_ addSubview:themesTable_];
 
     themesTable_ = [[UITableView alloc] initWithFrame:window_.bounds];
     [window_ addSubview:themesTable_];