Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
libksieve
Commits
9034c1d0
Commit
9034c1d0
authored
Jun 29, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix crash when server doesn't support "date"
(cherry picked from commit
05ed22b4
)
parent
9bf6d23d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
src/ksieveui/vacation/vacationpagewidget.cpp
src/ksieveui/vacation/vacationpagewidget.cpp
+15
-7
No files found.
src/ksieveui/vacation/vacationpagewidget.cpp
View file @
9034c1d0
...
...
@@ -123,7 +123,7 @@ void VacationPageWidget::slotGetResult(const QString &serverName, const QStringL
mUrl
.
setPath
(
mUrl
.
path
()
+
scriptName
);
// Whether the server supports the "date" extension
const
bool
supportsSieveDate
=
mUrl
.
scheme
()
==
QStringLiteral
(
"sieve"
)
&&
sieveCapabilities
.
contains
(
QStringLiteral
(
"date"
));
mHasDateSupport
=
mUrl
.
scheme
()
==
QStringLiteral
(
"sieve"
)
&&
sieveCapabilities
.
contains
(
QStringLiteral
(
"date"
));
KSieveUi
::
VacationUtils
::
Vacation
vacation
=
KSieveUi
::
VacationUtils
::
parseScript
(
script
);
...
...
@@ -143,8 +143,9 @@ void VacationPageWidget::slotGetResult(const QString &serverName, const QStringL
mVacationEditWidget
->
setDomainName
(
vacation
.
excludeDomain
);
mVacationEditWidget
->
enableDomainAndSendForSpam
(
!
VacationSettings
::
allowOutOfOfficeUploadButNoSettings
());
mVacationEditWidget
->
enableDates
(
supportsSieveDate
);
if
(
supportsSieveDate
)
{
mVacationEditWidget
->
enableDates
(
mHasDateSupport
);
qDebug
()
<<
" supportsSieveDate *****************"
<<
mHasDateSupport
;
if
(
mHasDateSupport
)
{
mVacationEditWidget
->
setStartDate
(
vacation
.
startDate
);
mVacationEditWidget
->
setStartTime
(
vacation
.
startTime
);
mVacationEditWidget
->
setEndDate
(
vacation
.
endDate
);
...
...
@@ -170,10 +171,17 @@ KSieveUi::VacationCreateScriptJob *VacationPageWidget::writeScript()
vacation
.
aliases
=
mVacationEditWidget
->
mailAliases
();
vacation
.
sendForSpam
=
mVacationEditWidget
->
sendForSpam
();
vacation
.
excludeDomain
=
mVacationEditWidget
->
domainName
();
if
(
mHasDateSupport
)
{
vacation
.
startDate
=
mVacationEditWidget
->
startDate
();
vacation
.
startTime
=
mVacationEditWidget
->
startTime
();
vacation
.
endDate
=
mVacationEditWidget
->
endDate
();
vacation
.
endTime
=
mVacationEditWidget
->
endTime
();
}
else
{
vacation
.
startDate
=
QDate
();
vacation
.
startTime
=
QTime
();
vacation
.
endDate
=
QDate
();
vacation
.
endTime
=
QTime
();
}
const
QString
script
=
VacationUtils
::
composeScript
(
vacation
);
createJob
->
setStatus
(
active
,
mWasActive
);
createJob
->
setScript
(
script
);
...
...
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