--- a/hotspotfw/rom/hotspot.iby	Tue Apr 27 17:47:07 2010 +0300
+++ b/hotspotfw/rom/hotspot.iby	Tue May 11 17:14:21 2010 +0300
@@ -27,7 +27,6 @@
 
 #ifdef __PROTOCOL_WLAN
 
-*** DLLs
 file=ABI_DIR\BUILD_DIR\hotspotclient.dll        SHARED_LIB_DIR\hotspotclient.dll
 file=ABI_DIR\BUILD_DIR\ictsclientinterface.dll  SHARED_LIB_DIR\ictsclientinterface.dll
 

--- a/wlanutilities/wlansniffer/aiplugin/inc/wsfaiplugin.h	Tue Apr 27 17:47:07 2010 +0300
+++ b/wlanutilities/wlansniffer/aiplugin/inc/wsfaiplugin.h	Tue May 11 17:14:21 2010 +0300
@@ -90,23 +90,23 @@
         * Steps 
         * @param ptr Pointer to an instance of this class
         */
-        static TInt CWsfAiPlugin::DoRefreshingStepL( TAny* ptr );
+        static TInt DoRefreshingStepL( TAny* ptr );
         
         /**
         * Steps the refresh animation
         */                
-        void CWsfAiPlugin::DoRefreshingStepL();
+        void DoRefreshingStepL();
         
         /**
         * Steps 
         * @param ptr Pointer to an instance of this class
         */
-        static TInt CWsfAiPlugin::DoConnectingStepL( TAny* ptr );
+        static TInt DoConnectingStepL( TAny* ptr );
         
         /**
         * Steps the refresh animation
         */                
-        void CWsfAiPlugin::DoConnectingStepL();
+        void DoConnectingStepL();
     
     public:     // from CHSContentPublisher
         

--- a/wlanutilities/wlansniffer/aiplugin/inc/wsfaipublishobserver.h	Tue Apr 27 17:47:07 2010 +0300
+++ b/wlanutilities/wlansniffer/aiplugin/inc/wsfaipublishobserver.h	Tue May 11 17:14:21 2010 +0300
@@ -23,7 +23,7 @@
 
 class CAknIconArray;
 class CEikLabel;
-class CArrayFix< TInt >;
+
 /**
  *  Abstract interface for wlan active idle plugin
  *

--- a/wlanutilities/wlansniffer/engine/server/group/server.mmp	Tue Apr 27 17:47:07 2010 +0300
+++ b/wlanutilities/wlansniffer/engine/server/group/server.mmp	Tue May 11 17:14:21 2010 +0300
@@ -26,7 +26,7 @@
 
 
 CAPABILITY ReadDeviceData NetworkServices NetworkControl ProtServ \
-           ReadUserData WriteDeviceData WriteUserData AllFiles
+           ReadUserData WriteDeviceData WriteUserData 
 
 EPOCSTACKSIZE 0x5000
 

--- a/wlanutilities/wlansniffer/mainapplication/inc/wsfmainviewcontainer.h	Tue Apr 27 17:47:07 2010 +0300
+++ b/wlanutilities/wlansniffer/mainapplication/inc/wsfmainviewcontainer.h	Tue May 11 17:14:21 2010 +0300
@@ -248,13 +248,12 @@
          * Steps the connecting animation
          * @param ptr Pointer to an instance of this class
          */
-        static TInt CWsfMainViewContainer::DoConnectingAnimationStepL( 
-                                                                TAny* ptr );
+        static TInt DoConnectingAnimationStepL( TAny* ptr );
         
         /**
          * Steps the connecting animation
          */                
-        void CWsfMainViewContainer::DoConnectingAnimationStepL();
+        void DoConnectingAnimationStepL();
 
         /**
          *  Initialize the connecting animation