Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
	src/BusinessLogic/Engine.cpp

diff --git a/src/BusinessLogic/Engine.cpp b/src/BusinessLogic/Engine.cpp
index 15d394d..0aad994 100644 (file)
--- a/src/BusinessLogic/Engine.cpp
+++ b/src/BusinessLogic/Engine.cpp
@@ -102,7 +102,6 @@ void Engine::closeApplication()
 void Engine::observedEventDetected()
 {
        qDebug() << "Engine::observedEventDetected()";
-
        if ( !iIdleTimeCounter->isActive() )
        {
                iWindowManager->weeklyView()->showCurrentWeek();
@@ -313,3 +312,4 @@ void Engine::fetchMeetingDetailsCancelled()
        iCommunication->cancelFetchMeetingDetails();
        iWindowManager->closeProgressBar();
 }
+