--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ConnectionUiUtilitiesImpl.cpp	Tue Aug 31 15:35:44 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ConnectionUiUtilitiesImpl.cpp	Wed Sep 01 12:23:51 2010 +0100
@@ -44,9 +44,8 @@
 #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"
@@ -85,11 +84,7 @@
 //
 CConnectionUiUtilitiesImpl::CConnectionUiUtilitiesImpl() 
 : iResOffset( 0 ),
-  iIsWlanSupported( EFalse ),
-  iDummy( EFalse ),
-  iDummySecMode( EWlanConnectionSecurityOpen ),
-  iDummyExtSecMode( EWlanConnectionExtentedSecurityModeOpen ),
-  iConnStatusPopup( NULL )
+  iIsWlanSupported( EFalse )
     {
     for ( TInt i = 0; i < KNumberOfWrappedDialogs; i++ )
         {
@@ -110,7 +105,6 @@
     iIsWlanSupported = 
                 FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );
     FeatureManager::UnInitializeLib();
-    iConnStatusPopup = CConnectionStatusPopup::NewL();
     }
 
 
@@ -130,8 +124,6 @@
         {
         delete iActiveWrapper[i];
         }
-
-    delete iConnStatusPopup;
     }
 
 // ---------------------------------------------------------
@@ -908,6 +900,89 @@
     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
 // ---------------------------------------------------------
@@ -929,28 +1004,47 @@
     iNotif.CancelConfirmMethodUsageQuery();
     }
 
-    
+
 // ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::WlanPowerSaveTestNote
+// CConnectionUiUtilitiesImpl::ConnectedViaConnMethodNote
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::WlanPowerSaveTestNote( 
-                                                    TBool&          aDisable,
+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,
                                                     TRequestStatus& aStatus )
     {
-    iNotif.WlanPowerSaveTestNote( aDisable, aStatus );
+    iNotif.ConnectedViaConnMethodNote( aConnMId, aStatus );
     }
 
         
 // ---------------------------------------------------------
-// CConnectionUiUtilitiesImpl::CancelWlanPowerSaveTestNote
+// CConnectionUiUtilitiesImpl::CancelConnectedViaConnMethodNote
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::CancelWlanPowerSaveTestNote()
+void CConnectionUiUtilitiesImpl::CancelConnectedViaConnMethodNote()
     {
-    iNotif.CancelWlanPowerSaveTestNote();
+    iNotif.CancelConnectedViaConnMethodNote();
     }
-    
+
 // ---------------------------------------------------------    
 // CConnectionUiUtilitiesImpl::EasyWapiDlg
 // ---------------------------------------------------------
@@ -979,13 +1073,26 @@
     return ( status == KErrNone ) ? ETrue : EFalse;
     }
 
-// ---------------------------------------------------------    
-// CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup
+// ---------------------------------------------------------
+// CConnectionUiUtilitiesImpl::NoWLANNetworksAvailableNote
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup( )
-    { 
-    iConnStatusPopup->ConnectingViaDiscreetPopup( );
+void CConnectionUiUtilitiesImpl::NoWLANNetworksAvailableNote()
+    {
+    if ( iIsWlanSupported )    
+        {
+        if ( !iActiveWrapper[ ENoWlanNetwsAvail ] )
+            {
+            TRAP_IGNORE( iActiveWrapper[ ENoWlanNetwsAvail ] = 
+                                    CActiveWrapper::NewL( ENoWlanNetwsAvail ) );
+            }
+
+        if ( iActiveWrapper[ ENoWlanNetwsAvail ] )
+            {
+            iActiveWrapper[ ENoWlanNetwsAvail ]->StartGenericNote( 
+                                                            ENoWlanNetwsAvail );
+            }
+        }
     }
 
 
@@ -993,33 +1100,45 @@
 // CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup(
-        const TUint32& aIapId,
-        TBool aConnectionAlreadyActive )
+void CConnectionUiUtilitiesImpl::ConnectingViaDiscreetPopup( const TUint32& aIapId )
     { 
-    iConnStatusPopup->ConnectingViaDiscreetPopup( aIapId,
-            aConnectionAlreadyActive );
+    iConnInfo().iIapId = aIapId;
+    
+    if ( !iActiveWrapper[ EConnectingViaDiscreetPopup ] )
+        {
+        TRAP_IGNORE( iActiveWrapper[ EConnectingViaDiscreetPopup ] = 
+                                CActiveWrapper::NewL( EConnectingViaDiscreetPopup ) );
+        }
+
+    if ( iActiveWrapper[ EConnectingViaDiscreetPopup ] )
+        {
+        iActiveWrapper[ EConnectingViaDiscreetPopup ]
+                        ->StartConnectingViaDiscreetPopup( iConnInfo );
+        }
     }
 
 
-// ---------------------------------------------------------    
-// CConnectionUiUtilitiesImpl::CancelConnectingViaDiscreetPopup
-// ---------------------------------------------------------
-//
-void CConnectionUiUtilitiesImpl::CancelConnectingViaDiscreetPopup()
-    {
-    iConnStatusPopup->CancelConnectingViaDiscreetPopup();
-    }
-
 
 // ---------------------------------------------------------    
 // CConnectionUiUtilitiesImpl::ConnectionErrorDiscreetPopup
 // ---------------------------------------------------------
 //
-void CConnectionUiUtilitiesImpl::ConnectionErrorDiscreetPopup(
-        const TInt& aErrCode )
+void CConnectionUiUtilitiesImpl::ConnectionErrorDiscreetPopup( const TInt& aErrCode )
     {
-    iConnStatusPopup->ConnectionErrorDiscreetPopup( aErrCode );
+    TPckgBuf< TInt > buf;
+    buf() = aErrCode;
+    
+    if ( !iActiveWrapper[ EConnectionErrorDiscreetPopup ] )
+        {
+        TRAP_IGNORE( iActiveWrapper[ EConnectionErrorDiscreetPopup ] = 
+                                CActiveWrapper::NewL( EConnectionErrorDiscreetPopup ) );
+        }
+
+    if ( iActiveWrapper[ EConnectionErrorDiscreetPopup ] )
+        {
+        iActiveWrapper[ EConnectionErrorDiscreetPopup ]
+                        ->StartConnectionErrorDiscreetPopup( buf );
+        }
     }
         
 // End of File