diff -r e1bea15f9a39 -r 79859ed3eea9 browserutilities/connectionmanager/Src/ConnectionObservers.cpp --- a/browserutilities/connectionmanager/Src/ConnectionObservers.cpp Thu Aug 19 10:58:56 2010 +0300 +++ b/browserutilities/connectionmanager/Src/ConnectionObservers.cpp Tue Aug 31 16:17:46 2010 +0300 @@ -18,13 +18,16 @@ * */ + + #include #include #include -#include -#include + +#include "ConnectionObservers.h" #include "ConnectionManagerLogger.h" + //-------------------------------------------------------------------------- //CConnectionStageNotifierWCB::NewL() //-------------------------------------------------------------------------- @@ -106,13 +109,11 @@ { CLOG_ENTERFN("CConnectionStageNotifierWCB::RunL()"); CLOG_WRITE_1( "CConnectionStageNotifierWCB Stage: %d", iProgressBuf().iStage ); - CLOG_WRITE_1( "CConnectionStageNotifierWCB Stage Error id: %d", iProgressBuf().iError ); if( !iMultiObserver ) { - CLOG_WRITE( "CConnectionStageNotifierWCB Browser UI" ); - if ( iProgressBuf().iStage == iStageToObserve ) - { + if ( iProgressBuf().iStage == iStageToObserve ) + { CLOG_WRITE( "Stage achived" ); DoCloseAgent(); iObserver->ConnectionStageAchievedL(); @@ -126,7 +127,6 @@ } else { - CLOG_WRITE( "CConnectionStageNotifierWCB Connection Manager" ); if( IsAnyStageReached( iProgressBuf().iStage ) ) { iMultiObserver->ConnectionStageAchievedL( iProgressBuf().iStage ); @@ -231,7 +231,6 @@ if( (err = iServer.Connect()) == KErrNone ) { err = iConnection.Open( iServer, *aConnName ); -#ifndef BRDO_OCC_ENABLED_FF if( !err ) { TBuf<64> query; @@ -259,9 +258,8 @@ } } } -#endif } - CLOG_WRITE_1( "CConnectionStageNotifierWCB::DoOpenAgentL Any error: %d", err ); + if( err ) { iConnection.Close(); @@ -296,14 +294,4 @@ return EFalse; } -//-------------------------------------------------------------------------- -//CConnectionStageNotifierWCB::GetProgressBuffer() -//-------------------------------------------------------------------------- -EXPORT_C TNifProgressBuf - CConnectionStageNotifierWCB::GetProgressBuffer() - { - CLOG_ENTERFN( "CConnectionStageNotifierWCB::GetProgressBuffer()" ); - return iProgressBuf; - } - //EOF