X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2FBusinessLogic%2FUIManager.cpp;fp=src%2FBusinessLogic%2FUIManager.cpp;h=eb806163e817bf189aed5751d7db75aeca4d25cc;hb=35a7d057e9343d0a940200074bef13991954bd2d;hp=505597bbe7831e129a22b561bdd1dcfdfd0d981f;hpb=8e4cea2a85073fb73a1dc58fb4adabb6269f4ac9;p=qtmeetings

diff --git a/src/BusinessLogic/UIManager.cpp b/src/BusinessLogic/UIManager.cpp
index 505597b..eb80616 100644
--- a/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@ -85,6 +85,7 @@ void UIManager::createSettingsView()
 	
 	// Connect signals
 	connect( iSettingsView, SIGNAL( okClicked() ), this, SLOT( settingsOkClicked() ) );
+	connect( iSettingsView, SIGNAL( cancelClicked() ), this, SLOT( settingsCancelClicked() ) );
 }
 
 void UIManager::createRoomStatusIndicator()
@@ -305,3 +306,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();
+	}
+}
\ No newline at end of file