Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KAlarm
Commits
01ae65a5
Commit
01ae65a5
authored
Feb 01, 2016
by
David Jarvie
Browse files
Merge commit '
fd5960c6
'
parents
c315fe1c
fd5960c6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/kaevent.cpp
View file @
01ae65a5
...
...
@@ -2,7 +2,7 @@
* kaevent.cpp - represents calendar events
* This file is part of kalarmcal library, which provides access to KAlarm
* calendar data.
* Copyright © 2001-201
3
by David Jarvie <djarvie@kde.org>
* Copyright © 2001-201
6
by David Jarvie <djarvie@kde.org>
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as published
...
...
@@ -944,8 +944,11 @@ void KAEventPrivate::set(const Event::Ptr &event)
case
DEFERRED_REMINDER_ALARM
:
case
DEFERRED_ALARM
:
mDeferral
=
(
data
.
type
==
DEFERRED_REMINDER_ALARM
)
?
REMINDER_DEFERRAL
:
NORMAL_DEFERRAL
;
mDeferralTime
=
dateTime
;
if
(
!
data
.
timedDeferral
)
{
if
(
data
.
timedDeferral
)
{
// Don't use start-of-day time for applying timed deferral alarm offset
mDeferralTime
=
data
.
alarm
->
hasStartOffset
()
?
data
.
alarm
->
startOffset
().
end
(
mNextMainDateTime
.
calendarKDateTime
())
:
data
.
alarm
->
time
();
}
else
{
mDeferralTime
=
dateTime
;
mDeferralTime
.
setDateOnly
(
true
);
}
if
(
data
.
alarm
->
hasStartOffset
())
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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