X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2FBusinessLogic%2FUIManager.cpp;fp=src%2FBusinessLogic%2FUIManager.cpp;h=e4cdc677de594ee29aa0d235d0596642b314b6ee;hb=55915c819fb472acaf93f560bad7a11a4ad89828;hp=d6d16b362ee86d81b064ef9c8da195ea148b34e8;hpb=83a9dd48d2482f6418c3ee24ddc994b723a1ef9f;p=qtmeetings

diff --git a/src/BusinessLogic/UIManager.cpp b/src/BusinessLogic/UIManager.cpp
index d6d16b3..e4cdc67 100644
--- a/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@ -98,6 +98,7 @@ void UIManager::createSettingsView()
 	
 	// Connect signals
 	connect( iSettingsView, SIGNAL( okClicked() ), this, SLOT( settingsOkClicked() ) );
+	connect( iSettingsView, SIGNAL( cancelClicked() ), this, SLOT( settingsCancelClicked() ) );
 }
 
 void UIManager::createRoomStatusIndicator()
@@ -298,3 +299,13 @@ void UIManager::hideProgressBar()
 		iProgressBar->close();
 	}
 }
+
+void UIManager::settingsCancelClicked()
+{
+	// Show the weekly view and restart the idle timer
+	if ( iWeeklyView != 0 )
+	{
+		iWindowManager->showView( static_cast<ViewBase *>( iWeeklyView ) );
+		iEngine->startIdleTimeCounter();
+	}
+}