Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KDE PIM Add-ons
Commits
6a02c254
Commit
6a02c254
authored
Oct 05, 2020
by
Laurent Montel
😁
Browse files
Don't modify expiry collection when we are not allowed
parent
9f5804fd
Pipeline
#36483
failed with stage
in 6 minutes and 40 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
6a02c254
...
...
@@ -63,7 +63,7 @@ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package
(
KF5Holidays
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
find_package
(
KF5GuiAddons
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
set
(
MAILCOMMON_LIB_VERSION
"5.15.4
7
"
)
set
(
MAILCOMMON_LIB_VERSION
"5.15.4
8
"
)
set
(
GRAVATAR_LIB_VERSION
"5.15.40"
)
set
(
PIMCOMMON_LIB_VERSION
"5.15.40"
)
set
(
GRANTLEETHEME_LIB_VERSION
"5.15.40"
)
...
...
plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsexperywidget.cpp
View file @
6a02c254
...
...
@@ -24,8 +24,10 @@ FolderConfigureSettingsExperyWidget::~FolderConfigureSettingsExperyWidget()
void
FolderConfigureSettingsExperyWidget
::
save
(
Akonadi
::
Collection
&
col
)
{
const
MailCommon
::
CollectionExpirySettings
settings
=
mCollectionExpiryWidget
->
settings
();
if
(
wasModified
())
{
mCollectionExpiryWidget
->
save
(
settings
,
col
,
true
,
false
);
if
(
MailCommon
::
CollectionExpiryWidget
::
canHandle
(
col
))
{
const
MailCommon
::
CollectionExpirySettings
settings
=
mCollectionExpiryWidget
->
settings
();
if
(
wasModified
())
{
mCollectionExpiryWidget
->
save
(
settings
,
col
,
true
,
false
);
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment