amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-06 22:08:51 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: f843025ba847f98dd8c231cef0b6ea7e430dc9b6
Monotone-Revision: d4476114c133c77a0b6b0b596165243704a68fb6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-13T18:55:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-07-13 18:55:44 +00:00
parent 64758d5e05
commit 80157e54ed
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2011-07-13 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Mailer/SOGoMailFolder.m
(-deleteUIDs:useTrashFolder:inContext:): the withTrash argument is
now a pointer since the method can modify it when the current
folder is the trash folder.
* SoObjects/Contacts/SOGoContactSourceFolder.m
(-_flattenedRecord:): added c_component key so the proper icon
appears beside entries in the Web interface.

2
SoObjects/Mailer/SOGoMailFolder.h
View File

@@ -53,7 +53,7 @@
- (NSArray *) toManyRelationshipKeys;
- (NSException *) deleteUIDs: (NSArray *) uids
useTrashFolder: (BOOL) withTrash
useTrashFolder: (BOOL *) withTrash
inContext: (id) context;
- (WOResponse *) archiveUIDs: (NSArray *) uids
inArchiveNamed: (NSString *) archiveName

9
SoObjects/Mailer/SOGoMailFolder.m
View File

@@ -265,8 +265,9 @@ static NSString *defaultUserID = @"anyone";
}
/* messages */
- (NSException *) deleteUIDs: (NSArray *) uids
useTrashFolder: (BOOL) withTrash
useTrashFolder: (BOOL *) withTrash
inContext: (id) localContext
{
SOGoMailFolder *trashFolder;
@@ -279,7 +280,7 @@ static NSString *defaultUserID = @"anyone";
client = nil;
trashFolder = nil;
b = YES;
if (withTrash)
if (*withTrash)
{
trashFolder = [[self mailAccountFolder] trashFolderInContext: localContext];
b = NO;
@@ -298,7 +299,7 @@ static NSString *defaultUserID = @"anyone";
// do not, of course, try to move messages to the Trash folder.
if ([folderName isEqualToString: [self relativeImap4Name]])
{
withTrash = NO;
*withTrash = NO;
}
else
{
@@ -335,7 +336,7 @@ static NSString *defaultUserID = @"anyone";
objectForKey: @"result"];
if ([result boolValue])
{
if (withTrash)
if (*withTrash)
{
[self markForExpunge];
if (trashFolder)

8
UI/MailerUI/UIxMailFolderActions.m
View File

@@ -234,20 +234,20 @@
NSArray *uids;
NSString *value;
NSDictionary *data;
BOOL withoutTrash;
BOOL withTrash;
co = [self clientObject];
value = [[context request] formValueForKey: @"uid"];
withoutTrash = [[[context request] formValueForKey: @"withoutTrash"] boolValue];
withTrash = ![[[context request] formValueForKey: @"withoutTrash"] boolValue];
response = nil;
if ([value length] > 0)
{
uids = [value componentsSeparatedByString: @","];
response = (WOResponse *) [co deleteUIDs: uids useTrashFolder: !withoutTrash inContext: context];
response = (WOResponse *) [co deleteUIDs: uids useTrashFolder: &withTrash inContext: context];
if (!response)
{
if (withoutTrash)
if (!withTrash)
{
// When not using a trash folder, return the quota
account = [co mailAccountFolder];