X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2FBusinessLogic%2FEngine.cpp;h=3f4597a4b92060d7a7ec293badd487216634f93d;hb=56f763c68a2ff56d344ef150b7378ca417d08b36;hp=ad8e1975c04a38c42f20293443b432c2e2d7bebb;hpb=3c310cf12a8f6516e16b7883c94478c5123e7238;p=qtmeetings

diff --git a/src/BusinessLogic/Engine.cpp b/src/BusinessLogic/Engine.cpp
index ad8e197..3f4597a 100644
--- a/src/BusinessLogic/Engine.cpp
+++ b/src/BusinessLogic/Engine.cpp
@@ -271,9 +271,11 @@ void Engine::errorHandler(int aCode, const QString &aAddInfo)
 {
 	qDebug() << "Engine::ErrorHandler, aCode: " << aCode;
 	// inform UI about the problem
-	if (aCode >= 100 && aCode <= 150)
+	if( aCode >= 100 && aCode <= 150 ) { //communication errors
+		//we don't want these to close operation changing
 		qDebug() << "CommunicationManager signaled an error:" << aCode;
-	iWindowManager->closeProgressBar();
+		iWindowManager->closeProgressBar();
+	}
 	iWindowManager->error(ErrorMapper::codeToString(aCode, aAddInfo) );
 }
 
@@ -320,10 +322,12 @@ void Engine::passwordEntered(PasswordDialog::PasswordStatus aPasswordStatus)
 	{
 		case PasswordDialog::Correct:
 		{
-			iWindowManager->showProgressBar("Changing current operation mode.", true);
-			connect(iWindowManager, SIGNAL( progressBarCancelled() ), this, SLOT( progressBarCancelled() ));
+			iAutoRefresh->stop(); //we stop the metting updating
+			iWindowManager->showProgressBar( "Changing current operation mode." );
 			connect(iDevice, SIGNAL( changingMode( const QString & ) ), iWindowManager, SLOT( updateProgressBar( const QString & ) ));
-			connect(iDevice, SIGNAL( changingModeFailed() ), this, SLOT( progressBarCancelled() ));
+			connect( iDevice, SIGNAL( changingMode( const QString & ) ),
+					iWindowManager, SLOT( updateProgressBar( const QString & ) ) );
+			connect( iDevice, SIGNAL( changeModeFailed() ), this, SLOT( changeModeFailed() ) );
 			iDevice->changeMode( true);
 			break;
 		}
@@ -340,12 +344,11 @@ void Engine::passwordEntered(PasswordDialog::PasswordStatus aPasswordStatus)
 	}
 }
 
-void Engine::progressBarCancelled()
+void Engine::changeModeFailed()
 {
-	qDebug() << "Engine::progressBarCancelled()";
-	//TODO: cancel the on-going event
+	qDebug() << "Engine::changeModeFailed()";
 	iWindowManager->closeProgressBar();
-	iDevice->changeMode( false);
+	iAutoRefresh->start(); //we start the metting updating
 }
 
 void Engine::fetchMeetingDetailsCancelled()