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

Fix custom mail labels in Sieve filter editor

Browse Source
This commit is contained in:
Francis Lachapelle
2014-02-14 21:32:33 -05:00
parent 75c8362df8
commit b34c6324cd
4 changed files with 40 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoSieveManager.m
+8 -7
View File
@@ -171,11 +171,6 @@ static NSString *sieveScriptName = @"sogo";
@"Junk", @"junk",
@"NotJunk", @"not_junk",
@"\\Seen", @"seen",
@"$Label1", @"label1",
@"$Label2", @"label2",
@"$Label3", @"label3",
@"$Label4", @"label4",
@"$Label5", @"label5",
nil];
[sieveFlags retain];
}
@@ -453,8 +448,8 @@ static NSString *sieveScriptName = @"sogo";
- (NSString *) _extractSieveAction: (NSDictionary *) action
{
NSString *sieveAction, *method, *requirement, *argument,
*flag, *mailbox;
NSString *sieveAction, *method, *requirement, *argument, *flag, *mailbox;
NSDictionary *mailLabels;
SOGoDomainDefaults *dd;
sieveAction = nil;
@@ -474,6 +469,12 @@ static NSString *sieveScriptName = @"sogo";
if ([method isEqualToString: @"addflag"])
{
flag = [sieveFlags objectForKey: argument];
if (!flag)
{
mailLabels = [[user userDefaults] mailLabelsColors];
if ([mailLabels objectForKey: argument])
flag = argument;
}
if (flag)
sieveAction = [NSString stringWithFormat: @"%@ %@",
method, [flag asSieveQuotedString]];