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
This commit is contained in:
parent
6bac931b69
commit
4998932fdd
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoToolRestore.m - this file is part of SOGo
|
/* 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>
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
*
|
*
|
||||||
|
@ -36,6 +36,7 @@
|
||||||
#import <Appointments/iCalEntityObject+SOGo.h>
|
#import <Appointments/iCalEntityObject+SOGo.h>
|
||||||
#import <SOGo/NSArray+Utilities.h>
|
#import <SOGo/NSArray+Utilities.h>
|
||||||
#import <SOGo/SOGoProductLoader.h>
|
#import <SOGo/SOGoProductLoader.h>
|
||||||
|
#import <SOGo/SOGoSystemDefaults.h>
|
||||||
#import <SOGo/SOGoUser.h>
|
#import <SOGo/SOGoUser.h>
|
||||||
#import <SOGo/SOGoUserDefaults.h>
|
#import <SOGo/SOGoUserDefaults.h>
|
||||||
#import <SOGo/SOGoUserManager.h>
|
#import <SOGo/SOGoUserManager.h>
|
||||||
|
@ -382,9 +383,10 @@ typedef enum SOGoToolRestoreMode {
|
||||||
- (BOOL) createFolder: (NSString *) folder
|
- (BOOL) createFolder: (NSString *) folder
|
||||||
withFM: (GCSFolderManager *) fm
|
withFM: (GCSFolderManager *) fm
|
||||||
{
|
{
|
||||||
|
NSString *folderType, *s;
|
||||||
NSArray *pathElements;
|
NSArray *pathElements;
|
||||||
NSException *error;
|
NSException *error;
|
||||||
NSString *folderType;
|
NSURL *url;
|
||||||
BOOL rc;
|
BOOL rc;
|
||||||
|
|
||||||
pathElements = [folder componentsSeparatedByString: @"/"];
|
pathElements = [folder componentsSeparatedByString: @"/"];
|
||||||
|
@ -393,9 +395,16 @@ typedef enum SOGoToolRestoreMode {
|
||||||
else
|
else
|
||||||
folderType = @"Appointment";
|
folderType = @"Appointment";
|
||||||
|
|
||||||
|
s = [[SOGoSystemDefaults sharedSystemDefaults] stringForKey: @"SOGoLocalStorageURL"];
|
||||||
|
url = nil;
|
||||||
|
|
||||||
|
if (s)
|
||||||
|
url = [NSURL URLWithString: s];
|
||||||
|
|
||||||
error = [fm createFolderOfType: folderType
|
error = [fm createFolderOfType: folderType
|
||||||
withName: [pathElements objectAtIndex: 4]
|
withName: [pathElements objectAtIndex: 4]
|
||||||
atPath: folder];
|
atPath: folder
|
||||||
|
andURL: url];
|
||||||
if (error)
|
if (error)
|
||||||
{
|
{
|
||||||
rc = NO;
|
rc = NO;
|
||||||
|
|
Loading…
Reference in a new issue