mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-21 15:02:40 +00:00
(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:
1 parent
88207d27c4
commit
30377c0fd6
21 files changed
+338
-16
No files matched your search
@@ -70,6 +70,7 @@
|
||||
SOGoSentFolderName = "Sent";
|
||||
SOGoDraftsFolderName = "Drafts";
|
||||
SOGoTrashFolderName = "Trash";
|
||||
SOGoJunkFolderName = "Junk";
|
||||
SOGoMailComposeMessageType = "html";
|
||||
SOGoMailDisplayRemoteInlineImages = "never";
|
||||
|
||||
|
||||
@@ -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 */
|
||||
@@ -361,4 +361,9 @@
|
||||
return [self boolForKey: @"SOGoNotifyOnExternalModifications"];
|
||||
}
|
||||
|
||||
- (NSDictionary *) mailJunkSettings
|
||||
{
|
||||
return [self objectForKey: @"SOGoMailJunkSettings"];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -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];
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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"];
|
||||
|
||||
Reference in new issue
Block a user