diff options
| -rw-r--r-- | resources/providers.json | 54 | ||||
| -rw-r--r-- | src/async/imap/MCIMAPQuotaOperation.cc | 6 | ||||
| -rw-r--r-- | src/core/basetypes/MCHTMLCleaner.cc | 2 | ||||
| -rwxr-xr-x | src/core/imap/MCIMAPSession.cc | 4 |
4 files changed, 65 insertions, 1 deletions
diff --git a/resources/providers.json b/resources/providers.json index c43aae0d..6435914b 100644 --- a/resources/providers.json +++ b/resources/providers.json @@ -840,7 +840,22 @@ "outlook\\.es", "outlook\\.co\\.th", "outlook\\.com\\.tr", - "outlook\\.com\\.vn" + "outlook\\.com\\.vn", + "hotmail\\.com", + "hotmail\\.co\\.uk", + "hotmail\\.fr", + "hotmail\\.de", + "hotmail\\.be", + "hotmail\\.com\\.ar", + "hotmail\\.es", + "hotmail\\.com\\.mx", + "hotmail\\.com", + "live\\.com", + "live\\.fr", + "live\\.de", + "live\\.be", + "live\\.com\\.ar", + "live\\.com\\.mx" ], "mailboxes":{ "drafts":"Drafts", @@ -904,5 +919,42 @@ "sentmail": "Sent", "trash": "Trash" } + }, + "mailru": { + "servers": { + "imap": [ + { + "port": 143, + "hostname": "imap.mail.ru", + "starttls": true + }, + { + "port": 993, + "hostname": "imap.mail.ru", + "ssl": true + } + ], + "smtp": [ + { + "port": 465, + "hostname": "smtp.mail.ru", + "ssl": true + } + ] + + }, + "domain-match": [ + "mail\\.ru", + "inbox\\.ru", + "list\\.ru", + "bk\\.ru", + "mail\\.ua" + ], + "mailboxes": { + "drafts": "Черновики", + "spam": "Спам", + "sentmail": "Отправленные", + "trash": "Корзина" + } } } diff --git a/src/async/imap/MCIMAPQuotaOperation.cc b/src/async/imap/MCIMAPQuotaOperation.cc index 6744ac4b..2268a384 100644 --- a/src/async/imap/MCIMAPQuotaOperation.cc +++ b/src/async/imap/MCIMAPQuotaOperation.cc @@ -36,6 +36,12 @@ uint32_t IMAPQuotaOperation::usage() void IMAPQuotaOperation::main() { ErrorCode error; + session()->session()->loginIfNeeded(&error); + if (error != ErrorNone) { + setError(error); + return; + } + session()->session()->getQuota(&mUsage, &mLimit, &error); setError(error); } diff --git a/src/core/basetypes/MCHTMLCleaner.cc b/src/core/basetypes/MCHTMLCleaner.cc index 079163bf..81145c9e 100644 --- a/src/core/basetypes/MCHTMLCleaner.cc +++ b/src/core/basetypes/MCHTMLCleaner.cc @@ -43,6 +43,8 @@ String * HTMLCleaner::cleanHTML(String * input) tidyOptSetBool(tdoc, TidyDropEmptyElems, no); #endif tidyOptSetBool(tdoc, TidyXhtmlOut, yes); + tidyOptSetInt(tdoc, TidyDoctypeMode, TidyDoctypeUser); + tidyOptSetBool(tdoc, TidyMark, no); tidySetCharEncoding(tdoc, "utf8"); tidyOptSetBool(tdoc, TidyForceOutput, yes); diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index 09ee841d..780012d4 100755 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -3607,6 +3607,10 @@ void IMAPSession::capabilitySetWithSessionState(IndexSet * capabilities) if (mailimap_has_compress_deflate(mImap)) { capabilities->addIndex(IMAPCapabilityCompressDeflate); } + if (mailimap_has_extension(mImap, (char *)"CHILDREN")) { + capabilities->addIndex(IMAPCapabilityChildren); + } + applyCapabilities(capabilities); } |