diff -r fc7b30ed2058 -r 05bc53fe583b connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ConnectionUiUtilitiesImpl.cpp
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ConnectionUiUtilitiesImpl.cpp	Thu Aug 19 10:18:49 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ConnectionUiUtilitiesImpl.cpp	Tue Aug 31 15:35:44 2010 +0300
@@ -44,8 +44,9 @@
 #include "ConnectionUiUtilitiesImpl.h"
 #include "ChangeConnectionDlg.h"
 #include "ActiveCChangeConnectionDlg.h"
+#include "connectionstatuspopup.h"
 
-#include <ConnectionUiUtilities.rsg>
+#include <connectionuiutilities.rsg>
 #include <data_caging_path_literals.hrh>
 
 #include "ConnectionDialogsLogger.h"
@@ -84,7 +85,11 @@
 //
 CConnectionUiUtilitiesImpl::CConnectionUiUtilitiesImpl() 
 : iResOffset( 0 ),
-  iIsWlanSupported( EFalse )
+  iIsWlanSupported( EFalse ),
+  iDummy( EFalse ),
+  iDummySecMode( EWlanConnectionSecurityOpen ),
+  iDummyExtSecMode( EWlanConnectionExtentedSecurityModeOpen ),
+  iConnStatusPopup( NULL )
     {
     for ( TInt i = 0; i < KNumberOfWrappedDialogs; i++ )
         {
@@ -105,6 +110,7 @@
     iIsWlanSupported = 
                 FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );
     FeatureManager::UnInitializeLib();
+    iConnStatusPopup = CConnectionStatusPopup::NewL();
     }
 
 
@@ -124,6 +130,8 @@
         {
         delete iActiveWrapper[i];
         }
+
+    delete iConnStatusPopup;
     }
 
 // ---------------------------------------------------------
@@ -900,89 +908,6 @@
     CLOG_LEAVEFN( "CConnectionUiUtilitiesImpl::SearchWLANNetworkAsync" );    
     }
 
-// ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::ConnectedViaDestAndConnMethodNote
-// ---------------------------------------------------------
-//
-void CConnectionUiUtilitiesImpl::ConnectedViaDestAndConnMethodNote( 
-                                                const TUint32 aDestId, 
-                                                const TUint32 aConnMId )
-    {
-    if ( !iActiveWrapper[EConnViaDestCM] )
-        {
-        TRAP_IGNORE( iActiveWrapper[EConnViaDestCM] = 
-                                    CActiveWrapper::NewL( EConnViaDestCM ) );
-        }
-
-    if ( iActiveWrapper[EConnViaDestCM] )
-        {
-        iActiveWrapper[EConnViaDestCM]->StartGenericNote( EConnViaDestCM, 
-                                                          aConnMId, aDestId );
-        }
-    }
-
-// ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::ConnectedViaDestAndConnMethodNote
-// ---------------------------------------------------------
-//
-void CConnectionUiUtilitiesImpl::ConnectedViaDestAndConnMethodNote( 
-                                                const TUint32 aDestId, 
-                                                const TUint32 aConnMId, 
-                                                TRequestStatus& aStatus )
-    {
-    iNotif.ConnectedViaDestAndConnMethodNote( aDestId, aConnMId, aStatus );
-    }
-        
-// ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::CancelConnectedViaDestAndConnMethodNote
-// ---------------------------------------------------------
-//
-void CConnectionUiUtilitiesImpl::CancelConnectedViaDestAndConnMethodNote()
-    {
-    iNotif.CancelConnectedViaDestAndConnMethodNote();
-    }
-
-// ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::ChangingConnectionToNote
-// ---------------------------------------------------------
-//
-void CConnectionUiUtilitiesImpl::ChangingConnectionToNote( 
-                                                const TUint32 aConnMId )
-    {
-    if ( !iActiveWrapper[EChangingConnTo] )
-        {
-        TRAP_IGNORE( iActiveWrapper[EChangingConnTo] = 
-                                    CActiveWrapper::NewL( EChangingConnTo ) );
-        }
-
-    if ( iActiveWrapper[EChangingConnTo] )
-        {
-        iActiveWrapper[EChangingConnTo]->StartGenericNote( EChangingConnTo,
-                                                           aConnMId );
-        }
-    }
-
-// ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::ChangingConnectionToNote
-// ---------------------------------------------------------
-//    
-void CConnectionUiUtilitiesImpl::ChangingConnectionToNote( 
-                                                const TUint32 aConnMId, 
-                                                TRequestStatus& aStatus )
-    {
-    iNotif.ChangingConnectionToNote( aConnMId, aStatus );  
-    }
-
-
-// ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::CancelChangingConnectionToNote
-// ---------------------------------------------------------
-//
-void CConnectionUiUtilitiesImpl::CancelChangingConnectionToNote()
-    {
-    iActiveWrapper[EChangingConnTo]->Cancel();
-    }
-
 // ---------------------------------------------------------    
 // CConnectionUiUtilitiesImpl::ConfirmMethodUsageQuery
 // ---------------------------------------------------------
@@ -1004,47 +929,28 @@
     iNotif.CancelConfirmMethodUsageQuery();
     }
 
-
+    
 // ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::ConnectedViaConnMethodNote
+// CConnectionUiUtilitiesImpl::WlanPowerSaveTestNote
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::ConnectedViaConnMethodNote( 
-                                                    const TUint32 aConnMId )
-    {
-    if ( !iActiveWrapper[EConnViaCM] )
-        {
-        TRAP_IGNORE( iActiveWrapper[EConnViaCM] = 
-                                        CActiveWrapper::NewL( EConnViaCM ) );
-        }
-
-    if ( iActiveWrapper[EConnViaCM] )
-        {
-        iActiveWrapper[EConnViaCM]->StartGenericNote( EConnViaCM, aConnMId );
-        }
-    }
-
-// ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::ConnectedViaConnMethodNote
-// ---------------------------------------------------------
-//
-void CConnectionUiUtilitiesImpl::ConnectedViaConnMethodNote( 
-                                                    const TUint32 aConnMId,
+void CConnectionUiUtilitiesImpl::WlanPowerSaveTestNote( 
+                                                    TBool&          aDisable,
                                                     TRequestStatus& aStatus )
     {
-    iNotif.ConnectedViaConnMethodNote( aConnMId, aStatus );
+    iNotif.WlanPowerSaveTestNote( aDisable, aStatus );
     }
 
         
 // ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::CancelConnectedViaConnMethodNote
+// CConnectionUiUtilitiesImpl::CancelWlanPowerSaveTestNote
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::CancelConnectedViaConnMethodNote()
+void CConnectionUiUtilitiesImpl::CancelWlanPowerSaveTestNote()
     {
-    iNotif.CancelConnectedViaConnMethodNote();
+    iNotif.CancelWlanPowerSaveTestNote();
     }
-
+    
 // ---------------------------------------------------------    
 // CConnectionUiUtilitiesImpl::EasyWapiDlg
 // ---------------------------------------------------------
@@ -1073,26 +979,13 @@
     return ( status == KErrNone ) ? ETrue : EFalse;
     }
 
-// ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::NoWLANNetworksAvailableNote
+// ---------------------------------------------------------    
+// CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::NoWLANNetworksAvailableNote()
-    {
-    if ( iIsWlanSupported )    
-        {
-        if ( !iActiveWrapper[ ENoWlanNetwsAvail ] )
-            {
-            TRAP_IGNORE( iActiveWrapper[ ENoWlanNetwsAvail ] = 
-                                    CActiveWrapper::NewL( ENoWlanNetwsAvail ) );
-            }
-
-        if ( iActiveWrapper[ ENoWlanNetwsAvail ] )
-            {
-            iActiveWrapper[ ENoWlanNetwsAvail ]->StartGenericNote( 
-                                                            ENoWlanNetwsAvail );
-            }
-        }
+void CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup( )
+    { 
+    iConnStatusPopup->ConnectingViaDiscreetPopup( );
     }
 
 
@@ -1100,45 +993,33 @@
 // CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup( const TUint32& aIapId )
+void CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup(
+        const TUint32& aIapId,
+        TBool aConnectionAlreadyActive )
     { 
-    iConnInfo().iIapId = aIapId;
-    
-    if ( !iActiveWrapper[ EConnectingViaDiscreetPopup ] )
-        {
-        TRAP_IGNORE( iActiveWrapper[ EConnectingViaDiscreetPopup ] = 
-                                CActiveWrapper::NewL( EConnectingViaDiscreetPopup ) );
-        }
-
-    if ( iActiveWrapper[ EConnectingViaDiscreetPopup ] )
-        {
-        iActiveWrapper[ EConnectingViaDiscreetPopup ]
-                        ->StartConnectingViaDiscreetPopup( iConnInfo );
-        }
+    iConnStatusPopup->ConnectingViaDiscreetPopup( aIapId,
+            aConnectionAlreadyActive );
     }
 
 
+// ---------------------------------------------------------    
+// CConnectionUiUtilitiesImpl::CancelConnectingViaDiscreetPopup
+// ---------------------------------------------------------
+//
+void CConnectionUiUtilitiesImpl::CancelConnectingViaDiscreetPopup()
+    {
+    iConnStatusPopup->CancelConnectingViaDiscreetPopup();
+    }
+
 
 // ---------------------------------------------------------    
 // CConnectionUiUtilitiesImpl::ConnectionErrorDiscreetPopup
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::ConnectionErrorDiscreetPopup( const TInt& aErrCode )
+void CConnectionUiUtilitiesImpl::ConnectionErrorDiscreetPopup(
+        const TInt& aErrCode )
     {
-    TPckgBuf< TInt > buf;
-    buf() = aErrCode;
-    
-    if ( !iActiveWrapper[ EConnectionErrorDiscreetPopup ] )
-        {
-        TRAP_IGNORE( iActiveWrapper[ EConnectionErrorDiscreetPopup ] = 
-                                CActiveWrapper::NewL( EConnectionErrorDiscreetPopup ) );
-        }
-
-    if ( iActiveWrapper[ EConnectionErrorDiscreetPopup ] )
-        {
-        iActiveWrapper[ EConnectionErrorDiscreetPopup ]
-                        ->StartConnectionErrorDiscreetPopup( buf );
-        }
+    iConnStatusPopup->ConnectionErrorDiscreetPopup( aErrCode );
     }
         
 // End of File