diff -r 489cf6208544 -r 95d45f234cf3 connectionmonitoring/connmon/connectionmonitor/src/ConnMonNoti.cpp --- a/connectionmonitoring/connmon/connectionmonitor/src/ConnMonNoti.cpp Thu May 27 13:17:01 2010 +0300 +++ b/connectionmonitoring/connmon/connectionmonitor/src/ConnMonNoti.cpp Wed Jun 23 18:39:24 2010 +0300 @@ -21,6 +21,8 @@ #include #include #include +#include // KErrPacketDataTsyMaxPdpContextsReached +#include // KErrUmtsMaxNumOfContextExceededByNetwork #include "ConnMonServ.h" #include "ConnMonSess.h" @@ -562,10 +564,10 @@ } else { - iEventInfo.Reset(); - if ( iInfoBuf().iStage != static_cast< TInt >( iEventInfo.iData ) ) { + iEventInfo.Reset(); + // Send only new stage info to clients iEventInfo.iEventType = EConnMonConnectionStatusChange; iEventInfo.iConnectionId = iConnectionId; @@ -640,35 +642,15 @@ } } - if ( iInfoBuf().iError == KErrNone ) - { - // New request - Receive(); - } - else + // New request + Receive(); + + if ( iInfoBuf().iError == KErrDisconnected ) { - // Connection is closing. - CSubConnUpDownNotifier* subConnUpDownNotifier = 0; - TInt err = iServer->Iap()->GetSubConnUpDownNotifier( - iConnectionId, - &subConnUpDownNotifier ); - - if ( KErrNone == err ) - { - // Subconn down notifier has stopped and allinterface closed event has arrived - if ( !subConnUpDownNotifier->IsActive() ) - { - subConnUpDownNotifier->SendDeletedEvent(); - } - } - - if ( iInfoBuf().iError == KErrDisconnected ) - { - // Enable WLAN scan when IAP availability is check for the - // next time because current bearer has been lost (-36). - // MPM needs a fresh list of available iaps. - iServer->Iap()->EnableWlanScan(); - } + // Enable WLAN scan when IAP availability is check for the + // next time because current bearer has been lost (-36). + // MPM needs a fresh list of available iaps. + iServer->Iap()->EnableWlanScan(); } } //LOGEXITFN("CProgressNotifier::RunL()")