Commit 48e0c609 authored by Andrew den Exter's avatar Andrew den Exter

Merge branch 'jb50586' into 'master'

Allow service folders to be set as the standard outbox folder.

See merge request !49
parents b2ab2e19 eea83ee4
From 03f36b882f2034157043d697368a58b544bc1ea3 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den.exter@jolla.com>
Date: Mon, 2 Nov 2020 06:18:17 +0000
Subject: [PATCH] Allow a service provided folder to be set as the standard
outbox folder.
---
src/libraries/qmfclient/qmailaccount.cpp | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/libraries/qmfclient/qmailaccount.cpp b/src/libraries/qmfclient/qmailaccount.cpp
index 79025c6e..48baaf37 100644
--- a/src/libraries/qmfclient/qmailaccount.cpp
+++ b/src/libraries/qmfclient/qmailaccount.cpp
@@ -620,15 +620,11 @@ QMailFolderId QMailAccount::standardFolder(QMailFolder::StandardFolder folder) c
*/
void QMailAccount::setStandardFolder(QMailFolder::StandardFolder folder, const QMailFolderId &folderId)
{
- if (folder == QMailFolder::OutboxFolder) {
- qWarning() << "Cannot configure Outbox for account!";
+ if (folderId == QMailFolderId()) {
+ // Resetting to default
+ d->_standardFolders.remove(folder);
} else {
- if (folderId == QMailFolderId()) {
- // Resetting to default
- d->_standardFolders.remove(folder);
- } else {
- d->_standardFolders.insert(folder, folderId);
- }
+ d->_standardFolders.insert(folder, folderId);
}
}
--
2.25.0
......@@ -55,6 +55,7 @@ Patch23: 0023-Retrieve-message-lists-based-on-the-folder-sync-poli.patch
Patch24: 0024-Apply-folder-policy-to-always-on-connection.patch
Patch25: 0025-Add-missing-slash-character-as-protected-in-header-p.patch
Patch26: 0026-Handle-encoded-word-s-containing-partial-characters.patch
Patch27: 0027-Allow-a-service-provided-folder-to-be-set-as-the-sta.patch
%description
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment