--- a/connectionmonitoring/connectionmonitorui/src/ConnectionInfoBase.cpp Thu Jan 07 12:56:54 2010 +0200
+++ b/connectionmonitoring/connectionmonitorui/src/ConnectionInfoBase.cpp Mon Jan 18 20:33:49 2010 +0200
@@ -216,13 +216,7 @@
//
CDesCArrayFlat* CConnectionInfoBase::GetDetailsArray() const
{
- CDesCArrayFlat* array = NULL;
- if ( ( iConnectionStatus == EConnectionSuspended ) ||
- ( iConnectionStatus == EConnectionCreated ) )
- {
- array = iDetailsArray;
- }
- return array;
+ return iDetailsArray;
}
// ---------------------------------------------------------
@@ -301,7 +295,7 @@
// ---------------------------------------------------------
//
void CConnectionInfoBase::RefreshConnectionStatus(
- const TConnectionStatus aConnectionStatus )
+ const TInt aConnectionStatus )
{
CMUILOGGER_ENTERFN( "RefreshConnectionStatus" );
CMUILOGGER_WRITE_F( "RefreshConnectionStatus aConnectionStatus %d",
@@ -317,9 +311,8 @@
CMUILOGGER_WRITE("1");
iConnectionStatus = EConnectionCreated;
}
- else if ( ( iConnectionStatus == EConnectionClosing ) &&
- ( ( aConnectionStatus == KConnectionClosed ) ||
- ( aConnectionStatus == KLinkLayerClosed ) ) )
+ else if ( ( aConnectionStatus == KConnectionClosed ) ||
+ ( aConnectionStatus == KLinkLayerClosed ) )
{
CMUILOGGER_WRITE("2");
iConnectionStatus = EConnectionClosed;