--- a/connectionutilities/ConnectionDialogs/group/ConnUiUtilsNotif.mmp	Tue Aug 31 15:35:44 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/group/ConnUiUtilsNotif.mmp	Wed Sep 01 12:23:51 2010 +0100
@@ -65,12 +65,18 @@
 SOURCE      WLANNetworkUnavailableNoteNotif.cpp
 SOURCE      ActiveWLANNetworkUnavailableNote.cpp
 
+SOURCE      ConfirmationQuery.cpp
+SOURCE      ConfirmationQueryNotif.cpp
+SOURCE      ActiveConnectViaNote.cpp
+SOURCE      ConnectViaNoteNotif.cpp
 SOURCE      NoteDlgSuppressingSwitch.cpp
-SOURCE      wlanpowersavetest.cpp
-SOURCE      wlanpowersavetestnotif.cpp
 SOURCE      easywapidlgnotif.cpp
-SOURCE      cellulardataconfirmation.cpp 
-SOURCE      devicedialogobserver.cpp
+SOURCE      nowlannetworksavailablenotif.cpp
+SOURCE      connectingviadiscreetpopup.cpp
+SOURCE      connectingviadiscreetpopupnotif.cpp
+SOURCE      connectionerrordiscreetpopup.cpp
+SOURCE      connectionerrordiscreetpopupnotif.cpp
+SOURCE      nowlansdiscreetpopup.cpp
 
 SOURCEPATH  ../src
 SOURCE      ConnectionInfo.cpp
@@ -90,11 +96,11 @@
 MW_LAYER_SYSTEMINCLUDE
 
 SYSTEMINCLUDE   /epoc32/include/libc 
-SYSTEMINCLUDE   /epoc32/include/uikon
+
 
 LIBRARY     euser.lib eikdlg.lib eiksrv.lib cone.lib eikcore.lib eikcoctl.lib
 LIBRARY     bafl.lib avkon.lib AknSkins.lib Ecom.lib 
-LIBRARY     eiksrvui.lib
+LIBRARY		eiksrvui.lib
 LIBRARY     commonengine.lib
 LIBRARY     AKNNOTIFY.LIB
 LIBRARY     AknIcon.lib
@@ -106,13 +112,11 @@
 LIBRARY     charconv.lib
 
 LIBRARY     commdb.lib
-LIBRARY     cmmanager.lib
+LIBRARY		  cmmanager.lib
 LIBRARY     etel3rdparty.lib 
-LIBRARY     HbCore.lib
-LIBRARY     HbWidgets.lib
 
 #if defined(ARMCC)
-DEFFILE ../ConnectionUiUtilities/EABI/ConnUiUtilsNotif.DEF
+    DEFFILE ../ConnectionUiUtilities/EABI/ConnUiUtilsNotif.DEF
 #elif defined( WINSCW )
     DEFFILE ../ConnectionUiUtilities/BWinsCw/ConnUiUtilsNotif.DEF
 #endif