--- a/ipsservices/ipssosplugin/inc/ipsplgpop3connectop.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/ipsservices/ipssosplugin/inc/ipsplgpop3connectop.h	Fri Apr 16 14:51:52 2010 +0300
@@ -26,7 +26,7 @@
 * Connect operation.
 * Encapsulates connection validation.
 */
-class CIpsPlgPop3ConnectOp :
+NONSHARABLE_CLASS ( CIpsPlgPop3ConnectOp ) :
     public CIpsPlgOnlineOperation,
     public MIpsPlgConnectOpCallback
     {
@@ -65,14 +65,7 @@
         */
         TFSProgress GetFSProgressL() const;
 
-        /**
-        *
-        */
-        TBool Connected() const;
-        
-        /**
-        *
-        */
+// <qmail> Connected() used from baseclass
         virtual TInt IpsOpType() const;
 
     protected:
@@ -119,42 +112,19 @@
         */
         void ConstructL();
 
-        /**
-        *
-        */
-        void DoConnectL();
-
-        /**
-        *
-        *
-        */
-        void DoPopulateL();
-        /**
-        *
-        */
-        TBool ValidateL();
-
+        // <qmail>
         /**
-        *
-        */
-        void QueryUsrPassL();
+         * Do.. functions handle certain state of this operation
+         */
+        void DoConnectL();
+        void DoPopulateL();
+// <qmail> TBool ValidateL() removed (did nothing)
+// <qmail> void DoQueryPasswordL() not used any more
+        void DoDisconnect();
+        // </qmail>
         
-         
-        /**
-        *
-        */
-        inline void SetFlag(TUint32 aFlag);
-
-        /**
-        *
-        */
-        inline void UnsetFlag(TUint32 aFlag);
-
-        /**
-        *
-        */
-        inline TBool FlagIsSet(TUint32 aFlag) const;
-
+        // <qmail> removed flag methods as they were not used or even defined anywhere
+        
     private: // Data
     
         enum TPopConnectStates 
@@ -162,7 +132,9 @@
             EStartConnect,
             EConnected,
             EPopulate,
-            EQueryingDetails,
+            // <qmail> new EDisconnecting state, removed querydetails state
+            EDisconnecting,
+            // </qmail>
             EErrInvalidDetails,
             EIdle
             };
@@ -173,10 +145,7 @@
         TInt                                            iPopulateLimit;
         TBool                                           iForcePopulate;
         CMsvEntrySelection*                             iSelection;
-        // not owned
-        CIpsPlgEventHandler*                            iEventHandler;
-        // set to true if connection is already exists
-        TBool iAlreadyConnected;
+        CIpsPlgEventHandler*                            iEventHandler; // not owned
     };
 
 #endif