connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/nowlannetworksavailablenotif.cpp
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/nowlannetworksavailablenotif.cpp Thu Dec 17 08:55:21 2009 +0200
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/nowlannetworksavailablenotif.cpp Thu Jan 07 12:56:54 2010 +0200
@@ -15,10 +15,10 @@
*
*/
-
// INCLUDE FILES
+#include "ConnectionDialogsUidDefs.h"
#include "nowlannetworksavailablenotif.h"
-#include "ActiveWLANNetworkUnavailableNote.h"
+#include "nowlansdiscreetpopup.h"
#include "ConnUiUtilsNotif.h"
@@ -59,10 +59,9 @@
iMessage = aMessage;
iCancelled = EFalse;
- iActiveNote = new( ELeave ) CActiveWLANNetworkUnavailableNote( this );
+ iActiveNote = CNoWlansDiscreetPopup::NewL( this );
- iActiveNote->LaunchWLANNetworkUnavailable(
- CActiveWLANNetworkUnavailableNote::EWlanNote2 );
+ iActiveNote->StartL();
}
// ---------------------------------------------------------
@@ -70,17 +69,13 @@
// ---------------------------------------------------------
//
void CNoWLANNetworksAvailableNotif::CompleteL( TInt aStatus )
- {
- delete iActiveNote;
- iActiveNote = NULL;
-
+ {
iCancelled = ETrue;
if ( !iMessage.IsNull() )
{
iMessage.Complete( aStatus );
}
- Cancel();
}
// ---------------------------------------------------------
@@ -124,7 +119,10 @@
{
iMessage.Complete( KErrCancel );
}
-
+ }
+
+ if ( iActiveNote )
+ {
delete iActiveNote;
iActiveNote = NULL;
}