Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'jb50586' into 'master'
Allow service folders to be set as the standard outbox folder. See merge request mer-core/messagingframework!49
- Loading branch information
Showing
2 changed files
with
38 additions
and
0 deletions.
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
rpm/0027-Allow-a-service-provided-folder-to-be-set-as-the-sta.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters