--- a/ipsservices/ipssosplugin/src/ipsplgconnectandrefreshfolderlist.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgconnectandrefreshfolderlist.cpp	Fri May 14 15:41:10 2010 +0300
@@ -16,13 +16,20 @@
 *
 */
 
+
+// <qmail> aknmessagequerydialog include removed
+
 #include "emailtrace.h"
 #include "ipsplgheaders.h"
 
+// <qmail> ipssossettings rsg removed
+// <qmail> fsmailserver rsg removed
+
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// <qmail> priority parameter has been removed
-// <qmail> rename selection parameter
+// <qmail> priority parameter removed, aSelection moved from ConstructL -> constructor
+// <qmail> MFSMailRequestObserver& changed to pointer
+// <qmail> renamed selection parameter
 CIpsPlgConnectAndRefreshFolderList* CIpsPlgConnectAndRefreshFolderList::NewL(
     CMsvSession& aSession, 
     TRequestStatus& aObserverRequestStatus,
@@ -49,7 +56,9 @@
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// <qmail> priority parameter has been removed
+// <qmail> priority parameter removed, aSelection moved from ConstructL -> constructor
+// <qmail> MFSMailRequestObserver& changed to pointer
+// <qmail> renamed selection parameter
 CIpsPlgConnectAndRefreshFolderList::CIpsPlgConnectAndRefreshFolderList(
     CMsvSession& aSession, 
     TRequestStatus& aObserverRequestStatus,
@@ -69,12 +78,13 @@
 	iState( EIdle ),
     iSelection( aSelection )
     {
+    FUNC_LOG;
     iService = aService;
-    FUNC_LOG;
     }
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
+// <qmail> aMsvEntry removed
 void CIpsPlgConnectAndRefreshFolderList::ConstructL()
     {
     FUNC_LOG;
@@ -117,6 +127,7 @@
 TFSProgress CIpsPlgConnectAndRefreshFolderList::GetFSProgressL() const
     {
     FUNC_LOG;
+    // Hardly ever called
     return TFSProgress();
     }
     
@@ -127,8 +138,10 @@
     FUNC_LOG;
     
     if( iStatus.Int() != KErrNone )
+// </qmail>
         {
         iState = ECompleted;
+// <qmail> DisplayLoginFailedDialogL removed
         CompleteObserver();
         return;
         }
@@ -143,7 +156,7 @@
                 iMsvSession,
                 iStatus,
                 iService,
-                iActivityTimer,
+                *iActivityTimer,
                 iFSMailboxId,
                 NULL, // no observer for suboperations
                 0, // no requestId needed
@@ -171,7 +184,7 @@
                 iMsvSession, 
                 iStatus, 
                 iService, 
-                iActivityTimer,
+                *iActivityTimer,
                 iFSMailboxId, 
                 NULL, // no observer for suboperations
                 0 ); // no requestId needed
@@ -202,6 +215,11 @@
     iState = ECompleted;
     }
 
+
+// <qmail> removed in Qmail
+//void CIpsPlgConnectAndRefreshFolderList::DisplayLoginFailedDialogL()
+// </qmail>
+
 // <qmail> new func to this op
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------