amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-15 05:14:53 +00:00
Code Issues Projects Releases Wiki Activity

merge of '31bc4f6b49316e2603b7496cfee3b18fdd5e490f'

Browse Source 
and '5244339e45ef9095573b10733228f85b81a17377'

Monotone-Parent: 31bc4f6b49316e2603b7496cfee3b18fdd5e490f
Monotone-Parent: 5244339e45ef9095573b10733228f85b81a17377
Monotone-Revision: 4437a82e041d016710ea3a45d8b7cf5b6341afff

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-13T21:08:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-13 21:08:25 +00:00
parent 2da9e90ebc 114e8bddc3
commit bf95e10746
23 changed files with 67 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Common/UIxAclEditor.m
+4 -1
View File
@@ -161,7 +161,10 @@
- (void) setUserUIDS: (NSString *) retainedUsers
{
if ([retainedUsers length] > 0)
savedUIDs = [retainedUsers componentsSeparatedByString: @","];
{
savedUIDs = [retainedUsers componentsSeparatedByString: @","];
[savedUIDs retain];
}
else
savedUIDs = [NSArray new];
}
UI/Common/UIxFolderActions.m
+1 -4
View File
@@ -65,10 +65,7 @@
ud = [activeUser userSettings];
moduleSettings = [ud objectForKey: baseFolder];
if (!moduleSettings)
{
moduleSettings = [NSMutableDictionary new];
[moduleSettings autorelease];
}
moduleSettings = [NSMutableDictionary dictionary];
[ud setObject: moduleSettings forKey: baseFolder];
mailInvitationParam
UI/Common/UIxPageFrame.m
+2
View File
@@ -53,6 +53,7 @@ static NSString *siteFavicon = nil;
title = nil;
toolbar = nil;
additionalJSFiles = nil;
additionalCSSFiles = nil;
}
return self;
@@ -64,6 +65,7 @@ static NSString *siteFavicon = nil;
[title release];
[toolbar release];
[additionalJSFiles release];
[additionalCSSFiles release];
[super dealloc];
}
UI/Contacts/UIxContactFoldersView.m
+2 -6
View File
@@ -67,10 +67,7 @@
ud = [activeUser userSettings];
moduleSettings = [ud objectForKey: module];
if (!moduleSettings)
{
moduleSettings = [NSMutableDictionary new];
[moduleSettings autorelease];
}
moduleSettings = [NSMutableDictionary dictionary];
[ud setObject: moduleSettings forKey: module];
}
@@ -317,8 +314,7 @@
// onObject: contactFolder
// inContext: context] == nil)
folders = [NSMutableArray new];
[folders autorelease];
folders = [NSMutableArray array];
subfolders = [[parentFolder subFolders] objectEnumerator];
while ((subfolder = [subfolders nextObject]))
UI/Contacts/UIxContactView.m
+8 -16
View File
@@ -48,9 +48,7 @@
{
NSMutableString *cardString;
cardString = [NSMutableString new];
[cardString autorelease];
cardString = [NSMutableString string];
if (value && [value length] > 0)
{
if (label)
@@ -129,7 +127,7 @@
NSString *email, *mailTo;
NSMutableArray *emails;
emails = [NSMutableArray new];
emails = [NSMutableArray array];
mailTo = nil;
[emails addObjectsFromArray: [card childrenWithTag: @"email"]];
@@ -151,8 +149,6 @@
@"%@</a>", email, [card fn], email, email];
}
[emails release];
return [self _cardStringWithLabel: @"Additional Email:"
value: mailTo];
}
@@ -276,8 +272,7 @@
city = [homeAdr value: 3];
prov = [homeAdr value: 4];
data = [NSMutableString new];
[data autorelease];
data = [NSMutableString string];
[data appendString: city];
if ([city length] > 0 && [prov length] > 0)
[data appendString: @", "];
@@ -294,8 +289,7 @@
postalCode = [homeAdr value: 5];
country = [homeAdr value: 6];
data = [NSMutableString new];
[data autorelease];
data = [NSMutableString string];
[data appendString: postalCode];
if ([postalCode length] > 0 && [country length] > 0)
[data appendFormat: @", ", country];
@@ -417,8 +411,7 @@
city = [workAdr value: 3];
prov = [workAdr value: 4];
data = [NSMutableString new];
[data autorelease];
data = [NSMutableString string];
[data appendString: city];
if ([city length] > 0 && [prov length] > 0)
[data appendString: @", "];
@@ -435,8 +428,7 @@
postalCode = [workAdr value: 5];
country = [workAdr value: 6];
data = [NSMutableString new];
[data autorelease];
data = [NSMutableString string];
[data appendString: postalCode];
if ([postalCode length] > 0 && [country length] > 0)
[data appendFormat: @", ", country];
@@ -513,13 +505,13 @@
- (id <WOActionResults>) vcardAction
{
#warning this method is unused
WOResponse *response;
card = [[self clientObject] vCard];
if (card)
{
response = [WOResponse new];
[response autorelease];
response = [context response];
[response setHeader: @"text/vcard" forKey: @"Content-type"];
[response appendContentString: [card versitString]];
}
UI/Contacts/UIxListView.m
+2
View File
@@ -26,6 +26,8 @@
#import <NGCards/NGVCard.h>
#import <NGCards/NGVCardReference.h>
#import <SOGo/NSArray+Utilities.h>
#import "UIxListView.h"
@implementation UIxListView
UI/MailPartViewers/UIxMailPartHTMLViewer.m
+1 -2
View File
@@ -306,7 +306,7 @@ _xmlCharsetForCharset (NSString *charset)
}
else
{
resultPart = [NSMutableString new];
resultPart = [NSMutableString string];
[resultPart appendFormat: @"<%@", _rawName];
max = [_attributes count];
@@ -353,7 +353,6 @@ _xmlCharsetForCharset (NSString *charset)
[resultPart appendString: @">"];
[result appendString: resultPart];
[resultPart release];
}
}
}
UI/MailerUI/UIxMailFolderActions.m
+1 -4
View File
@@ -328,10 +328,7 @@
ud = [[context activeUser] userSettings];
mailSettings = [ud objectForKey: @"Mail"];
if (!mailSettings)
{
mailSettings = [NSMutableDictionary new];
[mailSettings autorelease];
}
mailSettings = [NSMutableDictionary dictionary];
[ud setObject: mailSettings forKey: @"Mail"];
[mailSettings setObject: [co traversalFromMailAccount]
forKey: [NSString stringWithFormat: @"%@Folder",
UI/MailerUI/UIxMailListView.m
+1 -2
View File
@@ -751,8 +751,7 @@ static NSArray *udColumnOrder = nil;
NSEnumerator *flags;
NSString *currentFlag;
labels = [NSMutableArray new];
[labels autorelease];
labels = [NSMutableArray array];
flags = [[message objectForKey: @"flags"] objectEnumerator];
while ((currentFlag = [flags nextObject]))