Revision 3812626f pithos-macos/pithos_macosAppDelegate.m

b/pithos-macos/pithos_macosAppDelegate.m
44 44

  
45 45
@implementation pithos_macosAppDelegate
46 46
@synthesize storageURLPrefix, publicURLPrefix, loginURLPrefix, aboutURL;
47
@synthesize syncDirectoryPath, syncContainerName, syncTimeInterval;
47
@synthesize syncDirectoryPath, syncContainerName, syncTimeInterval, pithosSyncDaemon, alwaysNo;
48 48

  
49 49
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
50 50
    NSURL *testURL;
......
99 99
    [syncDirectoryPath retain];
100 100
    
101 101
    syncContainerName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"PithosSyncContainerName"];
102
    if (!syncContainerName || ![syncContainerName length]) {
102
    if (!syncContainerName || ![syncContainerName length] || [syncContainerName isEqualToString:@"trash"]) {
103 103
        syncContainerName = [NSString stringWithString:@"pithos"];
104 104
    }
105 105
    [syncContainerName retain];
......
135 135
    [statusItem setMenu:statusMenu];
136 136
    [statusItem setImage:sourceImage];
137 137
    [statusItem setHighlightMode:YES];
138
    
139
    self.alwaysNo = NO;
138 140
}
139 141

  
140 142
- (void)handleAppleEvent:(NSAppleEventDescriptor *)event withReplyEvent: (NSAppleEventDescriptor *)replyEvent {
......
235 237
}
236 238

  
237 239
- (void)startSyncWithDirectoryPath:(NSString *)directoryPath containerName:(NSString *)containerName {
238
    [pithosSyncDaemon release];
239
    pithosSyncDaemon = [[PithosSyncDaemon alloc] initWithDirectoryPath:syncDirectoryPath 
240
    self.pithosSyncDaemon = [[PithosSyncDaemon alloc] initWithDirectoryPath:syncDirectoryPath 
240 241
                                                         containerName:syncContainerName 
241 242
                                                          timeInterval:syncTimeInterval];
242 243
}

Also available in: Unified diff