connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/ConnUiUtilsNotif.cpp
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/ConnUiUtilsNotif.cpp Tue Aug 31 15:35:44 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/ConnUiUtilsNotif.cpp Wed Sep 01 12:23:51 2010 +0100
@@ -26,9 +26,12 @@
#include "EasyWepDlgNotif.h"
#include "EasyWpaDlgNotif.h"
#include "WLANNetworkUnavailableNoteNotif.h"
-#include "wlanpowersavetestnotif.h"
+#include "ConfirmationQueryNotif.h"
+#include "ConnectViaNoteNotif.h"
#include "easywapidlgnotif.h"
-#include "cellulardataconfirmation.h"
+#include "nowlannetworksavailablenotif.h"
+#include "connectingviadiscreetpopupnotif.h"
+#include "connectionerrordiscreetpopupnotif.h"
// CONSTANTS
@@ -46,9 +49,8 @@
//
EXPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
{
- CArrayPtrFlat<MEikSrvNotifierBase2>* array = NULL;
- TRAP_IGNORE( array = new (ELeave)
- CArrayPtrFlat<MEikSrvNotifierBase2>( KPluginGranularity ); )
+ CArrayPtrFlat<MEikSrvNotifierBase2>* array = new (ELeave)
+ CArrayPtrFlat<MEikSrvNotifierBase2>( KPluginGranularity );
if ( array )
{
@@ -111,12 +113,12 @@
aNotifiers->AppendL( serNotify );
CleanupStack::Pop( serNotify );
- serNotify = CCellularDataConfirmation::NewL( resourceFileResponsible );
+ serNotify = CConfirmationQueryNotif::NewL( resourceFileResponsible );
CleanupStack::PushL( serNotify );
aNotifiers->AppendL( serNotify );
CleanupStack::Pop( serNotify );
- serNotify = CWlanPowerSaveQueryNotif::NewL( resourceFileResponsible );
+ serNotify = CConnectViaNoteNotif::NewL( resourceFileResponsible );
CleanupStack::PushL( serNotify );
aNotifiers->AppendL( serNotify );
CleanupStack::Pop( serNotify );
@@ -126,6 +128,20 @@
aNotifiers->AppendL( serNotify );
CleanupStack::Pop( serNotify );
+ serNotify = CConnectingViaDiscreetPopupNotif::NewL( resourceFileResponsible );
+ CleanupStack::PushL( serNotify );
+ aNotifiers->AppendL( serNotify );
+ CleanupStack::Pop( serNotify );
+
+ serNotify = CNoWLANNetworksAvailableNotif::NewL( resourceFileResponsible );
+ CleanupStack::PushL( serNotify );
+ aNotifiers->AppendL( serNotify );
+ CleanupStack::Pop( serNotify );
+
+ serNotify = CConnectionErrorDiscreetPopupNotif::NewL( resourceFileResponsible );
+ CleanupStack::PushL( serNotify );
+ aNotifiers->AppendL( serNotify );
+ CleanupStack::Pop( serNotify );
}
// End of File