From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * Massive set of changes to bring in all fixes and enhancements from
 the Enterprise PIM branch * Ensured that the Trinity changes were applied on
 top of those enhancements, and any redundancy removed * Added journal read
 support to the CalDAV resource * Fixed CalDAV resource to use events URL for
 tasks and journals when separate URL checkbox unchecked

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kalarm/kalarmapp.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'kalarm/kalarmapp.cpp')

diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index f4daec9c2..7607892db 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -1631,13 +1631,11 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
 				if (win)
 					win->setRecreating();    // prevent post-alarm actions
 				delete win;
-				KAlarm::cancelScreenSaver();
 				(new MessageWin(event, alarm, reschedule, allowDefer))->show();
 			}
 			else
 			{
 				// Raise the existing message window and replay any sound
-				KAlarm::cancelScreenSaver();
 				win->repeat(alarm);    // N.B. this reschedules the alarm
 			}
 			break;
-- 
cgit v1.2.1