equal
deleted
inserted
replaced
653 { |
653 { |
654 const CIpsPlgBaseOperation* baseOp = |
654 const CIpsPlgBaseOperation* baseOp = |
655 iOperations[i]->BaseOperation(); |
655 iOperations[i]->BaseOperation(); |
656 if ( baseOp && baseOp->FSMailboxId() == aMailBoxId && |
656 if ( baseOp && baseOp->FSMailboxId() == aMailBoxId && |
657 ( baseOp->IpsOpType() == EIpsOpTypePop3SyncOp |
657 ( baseOp->IpsOpType() == EIpsOpTypePop3SyncOp |
|
658 || baseOp->IpsOpType() == EIpsOpTypePop3PopulateOp |
658 || baseOp->IpsOpType() == EIpsOpTypeImap4SyncOp |
659 || baseOp->IpsOpType() == EIpsOpTypeImap4SyncOp |
659 || baseOp->IpsOpType() == EIpsOpTypeImap4PopulateOp ) ) |
660 || baseOp->IpsOpType() == EIpsOpTypeImap4PopulateOp ) ) |
660 { |
661 { |
661 DeleteAndRemoveOperation( i, KErrCancel ); |
662 DeleteAndRemoveOperation( i, KErrCancel ); |
662 } |
663 } |
2196 TMsvId service = KErrNotFound; |
2197 TMsvId service = KErrNotFound; |
2197 TUint pluginId = PluginId(); |
2198 TUint pluginId = PluginId(); |
2198 if ( op && ( |
2199 if ( op && ( |
2199 op->IpsOpType() == EIpsOpTypeImap4SyncOp || |
2200 op->IpsOpType() == EIpsOpTypeImap4SyncOp || |
2200 op->IpsOpType() == EIpsOpTypePop3SyncOp || |
2201 op->IpsOpType() == EIpsOpTypePop3SyncOp || |
2201 op->IpsOpType() == EIpsOpTypeImap4PopulateOp ) ) |
2202 op->IpsOpType() == EIpsOpTypeImap4PopulateOp || |
|
2203 op->IpsOpType() == EIpsOpTypePop3PopulateOp ) ) |
2202 { |
2204 { |
2203 service = op->Service(); |
2205 service = op->Service(); |
2204 } |
2206 } |
2205 iOperations.Remove( aOpArrayIndex ); |
2207 iOperations.Remove( aOpArrayIndex ); |
2206 delete opWatcher; |
2208 delete opWatcher; |