From 08aa1c5329918dcc1d3a0704efb5f81c43680a78 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 29 May 2018 14:56:41 +0300
Subject: ancient perversion removed: function CListInitialise as the special
 entry point for contact lists (not to mix them with usual plugins)

---
 plugins/Clist_blind/src/init.cpp  | 10 +---------
 plugins/Clist_modern/src/init.cpp | 15 ++-------------
 plugins/Clist_nicer/src/init.cpp  | 10 +---------
 3 files changed, 4 insertions(+), 31 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp
index cb83fe7179..69d8883d96 100644
--- a/plugins/Clist_blind/src/init.cpp
+++ b/plugins/Clist_blind/src/init.cpp
@@ -115,7 +115,7 @@ static INT_PTR GetStatusMode(WPARAM, LPARAM)
 /////////////////////////////////////////////////////////////////////////////////////////
 // main clist initialization routine
 
-extern "C" int __declspec(dllexport) CListInitialise()
+int CMPlugin::Load()
 {
 	g_bSortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
 	g_bSortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
@@ -145,14 +145,6 @@ extern "C" int __declspec(dllexport) CListInitialise()
 	return 0;
 }
 
-/////////////////////////////////////////////////////////////////////////////////////////
-// a plugin loader aware of CList exports will never call this.
-
-int CMPlugin::Load()
-{
-	return 1;
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////
 
 wchar_t* MyDBGetContactSettingTString(MCONTACT hContact, char* module, char* setting, wchar_t* out, size_t len, wchar_t *def)
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index 34282b8c25..8969f7ed31 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -67,7 +67,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_CLIST,
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-extern "C" __declspec(dllexport) int CListInitialise()
+int CMPlugin::Load(void)
 {
 	g_dwMainThreadID = GetCurrentThreadId();
 	g_hMirApp = GetModuleHandleA("mir_app.mir");
@@ -81,18 +81,7 @@ extern "C" __declspec(dllexport) int CListInitialise()
 	CHECKRES(ClcLoadModule());
 	CHECKRES(ToolbarButtonLoadModule());
 	CHECKRES(ToolbarLoadModule());
-
-	TRACE("CListInitialise Modern Contact List ... Done\r\n");
-
-	return S_OK;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// never called by a newer plugin loader.
-
-int CMPlugin::Load(void)
-{
-	return 1;
+	return 0;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index d4132cf8a7..4bf1266d31 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -107,7 +107,7 @@ static int systemModulesLoaded(WPARAM, LPARAM)
 	return 0;
 }
 
-extern "C" int __declspec(dllexport) CListInitialise()
+int CMPlugin::Load()
 {
 	Clist_GetInterface();
 	coreCli = g_clistApi;
@@ -218,14 +218,6 @@ extern "C" int __declspec(dllexport) CListInitialise()
 	return rc;
 }
 
-/////////////////////////////////////////////////////////////////////////////////////////
-// a plugin loader aware of CList exports will never call this.
-
-int CMPlugin::Load()
-{
-	return 1;
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////
 
 int CMPlugin::Unload()
-- 
cgit v1.2.3