Fixed sogo-tool restore regarding previous commit

Monotone-Parent: 7d3c246e1b5f38cadd5bf14c9ca615f9af0f203e
Monotone-Revision: 4d4875b78377fad6c271a5fa4aca9647af06baed

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-03-28T12:28:33
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2011-03-28 12:28:33 +00:00
parent 6bac931b69
commit 4998932fdd
1 changed files with 13 additions and 4 deletions

View File

@ -1,6 +1,6 @@
/* SOGoToolRestore.m - this file is part of SOGo
*
* Copyright (C) 2009-2010 Inverse inc.
* Copyright (C) 2009-2011 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@ -36,6 +36,7 @@
#import <Appointments/iCalEntityObject+SOGo.h>
#import <SOGo/NSArray+Utilities.h>
#import <SOGo/SOGoProductLoader.h>
#import <SOGo/SOGoSystemDefaults.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
#import <SOGo/SOGoUserManager.h>
@ -382,9 +383,10 @@ typedef enum SOGoToolRestoreMode {
- (BOOL) createFolder: (NSString *) folder
withFM: (GCSFolderManager *) fm
{
NSString *folderType, *s;
NSArray *pathElements;
NSException *error;
NSString *folderType;
NSURL *url;
BOOL rc;
pathElements = [folder componentsSeparatedByString: @"/"];
@ -393,9 +395,16 @@ typedef enum SOGoToolRestoreMode {
else
folderType = @"Appointment";
s = [[SOGoSystemDefaults sharedSystemDefaults] stringForKey: @"SOGoLocalStorageURL"];
url = nil;
if (s)
url = [NSURL URLWithString: s];
error = [fm createFolderOfType: folderType
withName: [pathElements objectAtIndex: 4]
atPath: folder];
withName: [pathElements objectAtIndex: 4]
atPath: folder
andURL: url];
if (error)
{
rc = NO;