(feat) new junk/not junk capability with generic SMTP integration

Conflicts:

	NEWS
	SoObjects/Mailer/SOGoMailAccount.m
	SoObjects/SOGo/SOGoDefaults.plist
	SoObjects/SOGo/SOGoUser.m
	UI/MailerUI/UIxMailFolderActions.h
	UI/MailerUI/UIxMailFolderActions.m
	UI/MailerUI/product.plist
This commit is contained in:
Ludovic Marcotte committed 2016-01-22 13:58:45 -05:00
1 parent 88207d27c4
commit 30377c0fd6
21 files changed
+338 -16

No files matched your search

+1
View File
@@ -70,6 +70,7 @@
SOGoSentFolderName = "Sent";
SOGoDraftsFolderName = "Drafts";
SOGoTrashFolderName = "Trash";
SOGoJunkFolderName = "Junk";
SOGoMailComposeMessageType = "html";
SOGoMailDisplayRemoteInlineImages = "never";
+3 -1
View File
@@ -1,6 +1,6 @@
/* SOGoDomainDefaults.h - this file is part of SOGo
*
* Copyright (C) 2009-2015 Inverse inc.
* Copyright (C) 2009-2016 Inverse inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -81,6 +81,8 @@
- (BOOL) notifyOnPersonalModifications;
- (BOOL) notifyOnExternalModifications;
- (NSDictionary *) mailJunkSettings;
@end
#endif /* SOGODOMAINDEFAULTS_H */
+5
View File
@@ -361,4 +361,9 @@
return [self boolForKey: @"SOGoNotifyOnExternalModifications"];
}
- (NSDictionary *) mailJunkSettings
{
return [self objectForKey: @"SOGoMailJunkSettings"];
}
@end
+2
View File
@@ -830,6 +830,8 @@
forKey: @"Sent"];
[mailboxes setObject: [_defaults trashFolderName]
forKey: @"Trash"];
[mailboxes setObject: [_defaults junkFolderName]
forKey: @"Junk"];
[mailAccount setObject: mailboxes forKey: @"specialMailboxes"];
[mailboxes release];
+3
View File
@@ -108,6 +108,9 @@ extern NSString *SOGoWeekStartFirstFullWeek;
- (void) setTrashFolderName: (NSString *) newValue;
- (NSString *) trashFolderName;
- (void) setJunkFolderName: (NSString *) newValue;
- (NSString *) junkFolderName;
- (void) setFirstDayOfWeek: (int) newValue;
- (int) firstDayOfWeek;
+11
View File
@@ -458,6 +458,17 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
stringByEncodingImap4FolderName];
}
- (void) setJunkFolderName: (NSString *) newValue
{
[self setObject: newValue forKey: @"SOGoJunkFolderName"];
}
- (NSString *) junkFolderName
{
return [[self stringForKey: @"SOGoJunkFolderName"]
stringByEncodingImap4FolderName];
}
- (void) setFirstDayOfWeek: (int) newValue
{
[self setInteger: newValue forKey: @"SOGoFirstDayOfWeek"];