diff -r fc7b30ed2058 -r 05bc53fe583b connectionutilities/ConnectionDialogs/ConnectionUiUtilities/inc/ConnectionUiUtilitiesClient.h
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/inc/ConnectionUiUtilitiesClient.h	Thu Aug 19 10:18:49 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/inc/ConnectionUiUtilitiesClient.h	Tue Aug 31 15:35:44 2010 +0300
@@ -135,36 +135,6 @@
         void WLANNetworkUnavailableNote( TRequestStatus& aStatus );       
 
         /**
-        * Confirmation note is used after the connection has been successfully 
-        * established via destination and connection method.
-        * @param aDestId Id of used destination.
-        * @param aConnMId Id of used connection method.
-        * @param aStatus Status object of notifier.
-        */
-        void ConnectedViaDestAndConnMethodNote( const TUint32 aDestId, 
-                                                const TUint32 aConnMId,
-                                                TRequestStatus& aStatus );
-        /**
-        * Cancel ConnectedViaDestAndConnMethodNote notifier.
-        */
-        void CancelConnectedViaDestAndConnMethodNote();
-
-        /**
-        * Information note is used when "Automatically" roaming is enabled
-        * The actual connection establishment take places in the background
-        * (no wait note).
-        * @param aConnMId Id of used connection method.
-        * @param aStatus Status object of notifier.
-        */
-        void ChangingConnectionToNote( const TUint32 aConnMId,
-                                       TRequestStatus& aStatus );
-
-        /**
-        * Cancel ChangingConnectionToNote notifier.
-        */
-        void CancelChangingConnectionToNote();
-
-        /**
         * Notifier. Shows a query, "Connect to\n '%0U' via\n '%1U'?"
         * @param aResult Result of user selection, ETrue if user accepted
         * roaming, to more preferred method, EFlase otherwise
@@ -180,19 +150,18 @@
         */
         void CancelConfirmMethodUsageQuery();
 
-
         /**
-        * Confirmation note is used after the connection has been successfully 
-        * established via a connection method.
-        * @param aConnMId Id of used connection method.
+        * This note is displayed when power-save feature of the WLAN station 
+        * is incompatible and thus battery consumption of the mobile will increase.
+        * @param aDisable ETrue if user wants to disable this note in the future.
         * @param aStatus Status object of notifier.
         */
-        void ConnectedViaConnMethodNote( const TUint32 aConnMId,
-                                        TRequestStatus& aStatus );
+        void WlanPowerSaveTestNote( TBool& aDisable, TRequestStatus& aStatus );
+        
         /**
-        * Cancel ConnectedViaConnMethodNote notifier.
+        * Cancel WlanPowerSaveTestNote notifier.
         */
-        void CancelConnectedViaConnMethodNote();
+        void CancelWlanPowerSaveTestNote();
         
         /**
         * Notifier. Prompts WAPI-PSK.
@@ -208,36 +177,6 @@
         */                  
         void CancelEasyWapiDlg();
 
-        /**
-        * Pops up an information note: 
-        * "No WLAN networks are available at the moment. Connection not available."
-        */ 
-        void NoWLANNetworksAvailableNote( TRequestStatus& aStatus );                  
-        
-        /**
-        * Discreet popup. Shows "connecting via %U" discreet popup.
-        * @param aInfo Information about bearer.
-        */
-        void ConnectingViaDiscreetPopup( TPckgBuf< TConnUiConnectingViaDiscreetPopup>& aInfo, 
-                          TRequestStatus& aStatus );
-        
-        /**
-        * Cancel ConnectingViaDiscreetPopup notifier.
-        */                  
-        void CancelConnectingViaDiscreetPopup();                  
-
-        /**
-        * Discreet popup. Shows discreet popup about connection error.
-        * @param aErrCode Error code.
-        */
-        void ConnectionErrorDiscreetPopup( TPckgBuf< TInt >& aErrCode, 
-                          TRequestStatus& aStatus );
-        
-        /**
-        * Cancel ConnectionErrorDiscreetPopup notifier.
-        */                  
-        void CancelConnectionErrorDiscreetPopup();                  
-
     private:
 
         // Pointer to the client interface
@@ -260,8 +199,6 @@
 
         TPckgBuf<TConnUiUiDestConnMethodNoteId> iPassedInfo;
 
-        // used for get response from notifier
-        TBuf8<8> iResponseStrNoWLANNetworksAvailableNote;
     };