[ZNC-commits] SF.net SVN: znc:[1305] trunk/modules/email.cpp

[<ps...@us...>]

Revision: 1305
          http://znc.svn.sourceforge.net/znc/?rev=1305&view=rev
Author:   psychon
Date:     2008-12-27 09:06:49 +0000 (Sat, 27 Dec 2008)

Log Message:
-----------
Use CSocket instead of Csock in the email module

Modified Paths:
--------------
    trunk/modules/email.cpp

Modified: trunk/modules/email.cpp
===================================================================
--- trunk/modules/email.cpp	2008-12-26 15:12:25 UTC (rev 1304)
+++ trunk/modules/email.cpp	2008-12-27 09:06:49 UTC (rev 1305)
@@ -45,12 +45,7 @@
 		m_bInitialized = false;
 	}
 
-	virtual ~CEmail()
-	{
-		vector<Csock*> vSocks = m_pManager->FindSocksByName("EMAIL::" + m_pUser->GetUserName());
-		for (u_int a = 0; a < vSocks.size(); a++)
-			m_pManager->DelSockByAddr(vSocks[a]);
-	}
+	virtual ~CEmail() {}
 
 	virtual bool OnLoad(const CString & sArgs, CString& sMessage) {
 		m_sMailPath = sArgs;
@@ -138,10 +133,10 @@
 	bool			m_bInitialized;
 };
 
-class CEmailFolder : public Csock
+class CEmailFolder : public CSocket
 {
 public:
-	CEmailFolder(CEmail *pModule, const CString & sMailbox) : Csock()
+	CEmailFolder(CEmail *pModule, const CString & sMailbox) : CSocket(pModule)
 	{
 		m_pModule = pModule;
 		m_sMailbox = sMailbox;
@@ -243,7 +238,7 @@
 		CEmailFolder *p = new CEmailFolder(this, m_sMailPath);
 		p->SetRSock(iFD);
 		p->SetWSock(iFD);
-		m_pManager->AddSock((Csock *)p, "EMAIL::" + m_pUser->GetUserName());
+		m_pManager->AddSock(p, "EMAIL::" + m_pUser->GetUserName());
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.