- skype proto instance init funcs moved to skype_instances.cpp

- some minor fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@1776 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 3 insertions, 24 deletions

diff --git a/protocols/Skype/src/skype.cpp b/protocols/Skype/src/skype.cpp
index a3e5823c7b..e905bcf8be 100644
--- a/protocols/Skype/src/skype.cpp
+++ b/protocols/Skype/src/skype.cpp
@@ -21,16 +21,10 @@ PLUGININFOEX pluginInfo =
 	{ 0x9c448c61, 0xfc3f, 0x42f9, { 0xb9, 0xf0, 0x4a, 0x30, 0xe1, 0xcf, 0x86, 0x71 } }

 };

 

-static int compare_protos(const CSkypeProto *p1, const CSkypeProto *p2)

-{

-	return _tcscmp(p1->m_tszUserName, p2->m_tszUserName);

-}

-

-LIST<CSkypeProto> g_Instances(1, compare_protos);

-

 DWORD WINAPI DllMain(HINSTANCE hInstance, DWORD, LPVOID)

 {

 	g_hInstance = hInstance;

+

 	return TRUE;

 }

 

@@ -41,21 +35,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 

 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

-static CSkypeProto* SkypeProtoInit(const char* pszProtoName, const TCHAR* tszUserName)

-{

-	CSkypeProto *ppro = new CSkypeProto(pszProtoName, tszUserName);

-	g_Instances.insert(ppro);

-	return ppro;

-	return 0;

-}

-

-static int SkypeProtoUninit(CSkypeProto* ppro)

-{

-	g_Instances.remove(ppro);

-	delete ppro;

-	return 0;

-}

-

 char* keyBuf = 0;

 int port = 8963;

 

@@ -150,8 +129,8 @@ extern "C" int __declspec(dllexport) Load(void)
 	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };

 	pd.szName = MODULE;

 	pd.type = PROTOTYPE_PROTOCOL;

-	pd.fnInit = (pfnInitProto)SkypeProtoInit;

-	pd.fnUninit = (pfnUninitProto)SkypeProtoUninit;

+	pd.fnInit = (pfnInitProto)CSkypeProto::InitSkypeProto;

+	pd.fnUninit = (pfnUninitProto)CSkypeProto::UninitSkypeProto;

 	CallService(MS_PROTO_REGISTERMODULE, 0, reinterpret_cast<LPARAM>(&pd));

 

 	CSkypeProto::InitIcons();