[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] kalarm: Merge commit '8c495f421fa36fa2c4c1307034eaddcc6174fcad'
From:       David Jarvie <djarvie () kde ! org>
Date:       2014-08-31 18:15:58
Message-ID: E1XO9fS-0000O1-RZ () scm ! kde ! org
[Download RAW message or body]

Git commit 749a03fd7ee926365fa20299bf714823c68f24f1 by David Jarvie.
Committed on 31/08/2014 at 18:18.
Pushed by djarvie into branch 'master'.

Merge commit '8c495f421fa36fa2c4c1307034eaddcc6174fcad'

M  +1    -0    kalarm/messagewin.cpp

http://commits.kde.org/kdepim/749a03fd7ee926365fa20299bf714823c68f24f1

diff --cc kalarm/messagewin.cpp
index 760d60d,222096e..6020c41
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@@ -1059,9 -1108,14 +1059,10 @@@ void MessageWin::readProperties(const K
      mCommandError        = KAEvent::CmdErrType(config.readEntry("CmdErr", \
static_cast<int>(KAEvent::CMD_NO_ERROR)));  mDontShowAgain       = \
config.readEntry("DontShowAgain", QString());  mShowEdit            = false;
 -#ifdef USE_AKONADI
 -    // Temporarily initialise mCollectionId and mEventId - they will be set by \
redisplayAlarm() ++    // Temporarily initialise mCollection and mEventId - they will \
be set by redisplayAlarm()  mCollection          = Akonadi::Collection();
      mEventId             = EventId(mCollection.id(), eventId);
 -#else
 -    mResource            = 0;
 -#endif
 -    kDebug() << eventId;
 +    qDebug() << eventId;
      if (mAlarmType != KAAlarm::INVALID_ALARM)
      {
          // Recreate the event from the calendar file (if possible)


[prev in list] [next in list] [prev in thread] [next in thread]