mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-21 23:12:40 +00:00
Monotone-Parent: 7b6ad79fde0791f201e8b98eb957ded1410de5c1
Monotone-Revision: 7576485920bab942eaccc45f2ab5b1914255643d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-04-20T21:30:17 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
1 parent
769979d8d5
commit
b7067eec65
25 files changed
+68
-59
No files matched your search
+3
-3
@@ -93,7 +93,7 @@
|
||||
}
|
||||
|
||||
- (BOOL) _handleData: (NSData *) socketData
|
||||
onSocket: (NGActiveSocket *) responseSocket
|
||||
onSocket: (id <NGActiveSocket>) responseSocket
|
||||
{
|
||||
NSString *stringData;
|
||||
SOGoSockDScanner *scanner;
|
||||
@@ -109,7 +109,7 @@
|
||||
if (operation)
|
||||
{
|
||||
rc = YES;
|
||||
[operation respondOnSocket: responseSocket];
|
||||
[operation respondOnSocket: (NGActiveSocket *) responseSocket];
|
||||
}
|
||||
else
|
||||
rc = NO;
|
||||
@@ -122,7 +122,7 @@
|
||||
|
||||
- (void) _acceptAndHandle
|
||||
{
|
||||
NGActiveSocket *socket;
|
||||
id <NGActiveSocket> socket;
|
||||
char buffer[1024];
|
||||
unsigned int count;
|
||||
NSMutableData *socketData;
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
#import <Contacts/SOGoContactFolders.h>
|
||||
#import <Contacts/SOGoContactGCSFolder.h>
|
||||
#import <SOGo/SOGoProductLoader.h>
|
||||
#import <SOGo/SOGoUserFolder.h>
|
||||
#import <SOGo/NSDictionary+Utilities.h>
|
||||
#import <SOGo/NSString+Utilities.h>
|
||||
|
||||
@@ -50,7 +51,7 @@
|
||||
}
|
||||
|
||||
+ (SOGoSockDOperation *) operationWithMethod: (NSString *) method
|
||||
andParameters: (NSDictionary *) parameters
|
||||
andParameters: (NSDictionary *) opParameters
|
||||
{
|
||||
static NSArray *operations = nil;
|
||||
NSString *className;
|
||||
@@ -66,7 +67,7 @@
|
||||
[method capitalizedString]];
|
||||
newOperation = [NSClassFromString (className) new];
|
||||
[newOperation autorelease];
|
||||
[newOperation setParameters: parameters];
|
||||
[newOperation setParameters: opParameters];
|
||||
}
|
||||
else
|
||||
newOperation = nil;
|
||||
|
||||
+2
-2
@@ -36,8 +36,8 @@
|
||||
+ (NSString *) command;
|
||||
+ (NSString *) description;
|
||||
|
||||
+ (BOOL) runToolWithArguments: (NSArray *) arguments
|
||||
verbose: (BOOL) verbose;
|
||||
+ (BOOL) runToolWithArguments: (NSArray *) toolArguments
|
||||
verbose: (BOOL) isVerbose;
|
||||
|
||||
- (void) setArguments: (NSArray *) newArguments;
|
||||
- (void) setVerbose: (BOOL) newVerbose;
|
||||
|
||||
+5
-4
@@ -20,6 +20,7 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSString.h>
|
||||
|
||||
#import "SOGoTool.h"
|
||||
@@ -39,16 +40,16 @@
|
||||
return nil;
|
||||
}
|
||||
|
||||
+ (BOOL) runToolWithArguments: (NSArray *) arguments
|
||||
verbose: (BOOL) verbose
|
||||
+ (BOOL) runToolWithArguments: (NSArray *) toolArguments
|
||||
verbose: (BOOL) isVerbose
|
||||
{
|
||||
SOGoTool *instance;
|
||||
|
||||
instance = [self new];
|
||||
[instance autorelease];
|
||||
|
||||
[instance setArguments: arguments];
|
||||
[instance setVerbose: verbose];
|
||||
[instance setArguments: toolArguments];
|
||||
[instance setVerbose: isVerbose];
|
||||
|
||||
return [instance run];
|
||||
}
|
||||
|
||||
@@ -99,7 +99,6 @@
|
||||
{
|
||||
NSFileManager *fm;
|
||||
BOOL exists, isDir, rc;
|
||||
NSError *createError;
|
||||
|
||||
fm = [NSFileManager defaultManager];
|
||||
exists = [fm fileExistsAtPath: directory isDirectory: &isDir];
|
||||
@@ -116,12 +115,9 @@
|
||||
else
|
||||
{
|
||||
rc = [fm createDirectoryAtPath: directory
|
||||
withIntermediateDirectories: YES
|
||||
attributes: nil
|
||||
error: &createError];
|
||||
attributes: nil];
|
||||
if (!rc)
|
||||
NSLog (@"an error occured during directory creation: %@",
|
||||
createError);
|
||||
NSLog (@"an error occured during directory creation");
|
||||
}
|
||||
|
||||
return rc;
|
||||
|
||||
Reference in new issue
Block a user