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