minus MS_CLIST_RETRIEVE_INTERFACE

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

15 files changed, 17 insertions, 23 deletions

diff --git a/src/core/stdauth/src/main.cpp b/src/core/stdauth/src/main.cpp
index bfda91b735..c749c7e152 100644
--- a/src/core/stdauth/src/main.cpp
+++ b/src/core/stdauth/src/main.cpp
@@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAUTH
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	LoadSendRecvAuthModule();

 	return 0;

diff --git a/src/core/stdaway/src/main.cpp b/src/core/stdaway/src/main.cpp
index 7e2f22e7c7..73b9d69e5b 100644
--- a/src/core/stdaway/src/main.cpp
+++ b/src/core/stdaway/src/main.cpp
@@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAWAY
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	LoadAwayMsgModule();

 	return 0;

diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp
index 07859e361a..efb3aa504a 100644
--- a/src/core/stdchat/src/main.cpp
+++ b/src/core/stdchat/src/main.cpp
@@ -340,7 +340,7 @@ static void TabsInit()
 extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	AddIcons();

 	RegisterFonts();

diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp
index 2373ac2c35..e9e8a9100b 100644
--- a/src/core/stdclist/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -133,10 +133,10 @@ static INT_PTR GetStatusMode(WPARAM, LPARAM)
 extern "C" __declspec(dllexport) int CListInitialise()

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

-	g_bSortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
-	g_bSortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
+	g_bSortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);

+	g_bSortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);

 

 	coreCli = *pcli;

 	pcli->hInst = g_hInst;

diff --git a/src/core/stdfile/src/main.cpp b/src/core/stdfile/src/main.cpp
index d68fa833ed..d7aff5d45f 100644
--- a/src/core/stdfile/src/main.cpp
+++ b/src/core/stdfile/src/main.cpp
@@ -59,7 +59,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRFILE
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	if ( IsWinVer7Plus())

 		CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface);

diff --git a/src/core/stdhelp/src/main.cpp b/src/core/stdhelp/src/main.cpp
index 325fa65cf8..c60861c781 100644
--- a/src/core/stdhelp/src/main.cpp
+++ b/src/core/stdhelp/src/main.cpp
@@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIHELP
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	LoadHelpModule();

 	return 0;

diff --git a/src/core/stdidle/src/main.cpp b/src/core/stdidle/src/main.cpp
index f9edfd4ffe..ed4b18f224 100644
--- a/src/core/stdidle/src/main.cpp
+++ b/src/core/stdidle/src/main.cpp
@@ -58,7 +58,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_IDLE,
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	LoadIdleModule();

 	return 0;

diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp
index 8c1221fd2e..397b84676c 100644
--- a/src/core/stdmsg/src/srmm.cpp
+++ b/src/core/stdmsg/src/srmm.cpp
@@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_SRMM, M
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	return LoadSendRecvMessageModule();

 }

diff --git a/src/core/stduihist/src/main.cpp b/src/core/stduihist/src/main.cpp
index f051bf4869..dc22f10813 100644
--- a/src/core/stduihist/src/main.cpp
+++ b/src/core/stduihist/src/main.cpp
@@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIHIST
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	LoadHistoryModule();

 	return 0;

diff --git a/src/core/stduserinfo/src/main.cpp b/src/core/stduserinfo/src/main.cpp
index 1c3a0c8317..2c94290564 100644
--- a/src/core/stduserinfo/src/main.cpp
+++ b/src/core/stduserinfo/src/main.cpp
@@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIUSER
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	LoadUserInfoModule();

 	return 0;

diff --git a/src/core/stduseronline/src/main.cpp b/src/core/stduseronline/src/main.cpp
index cfd3c55f07..ef52a01abf 100644
--- a/src/core/stduseronline/src/main.cpp
+++ b/src/core/stduseronline/src/main.cpp
@@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_USERON
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

-	mir_getCLI();

+	pcli = Clist_GetInterface();

 

 	LoadUserOnlineModule();

 	return 0;

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 0f232a662e..7e16017196 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -68,7 +68,7 @@ static void fnReloadProtoMenus(void)
 	cli.pfnCluiProtocolStatusChanged(0, 0);

 }

 

-static INT_PTR srvRetrieveInterface(WPARAM, LPARAM)

+MIR_APP_DLL(CLIST_INTERFACE*) Clist_GetInterface(void)

 {

 	int rc;

 

@@ -213,11 +213,5 @@ static INT_PTR srvRetrieveInterface(WPARAM, LPARAM)
 		interfaceInited = 1;

 	}

 

-	return (LPARAM)&cli;

-}

-

-int LoadContactListModule()

-{

-	CreateServiceFunction(MS_CLIST_RETRIEVE_INTERFACE, srvRetrieveInterface);

-	return 0;

+	return &cli;

 }

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index c54c104990..0eb0475b37 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -272,3 +272,4 @@ Clist_ContactChangeGroup @271
 Clist_ContactCompare @272

 Clist_ContactDoubleClicked @273

 Clist_GetImageList @274

+Clist_GetInterface @275

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 90a51705a2..1d6f6103f9 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -272,3 +272,4 @@ Clist_ContactChangeGroup @271
 Clist_ContactCompare @272

 Clist_ContactDoubleClicked @273

 Clist_GetImageList @274

+Clist_GetInterface @275

diff --git a/src/mir_app/src/modules.cpp b/src/mir_app/src/modules.cpp
index 7685038d24..13e23f6411 100644
--- a/src/mir_app/src/modules.cpp
+++ b/src/mir_app/src/modules.cpp
@@ -42,7 +42,6 @@ int  LoadEventsModule(void);
 int  LoadSrmmModule(void);

 

 int  LoadContactsModule(void);

-int  LoadContactListModule(void);// ui: clist

 int  LoadDatabaseModule(void);

 int  LoadMetacontacts(void);

 int  LoadOptionsModule(void);	// ui: options dialog

@@ -144,7 +143,6 @@ int LoadDefaultModules(void)
 	if (LoadProtocolsModule()) return 1;

 	LoadDbAccounts();                    // retrieves the account array from a database

 	if (LoadContactsModule()) return 1;

-	if (LoadContactListModule()) return 1;   // prepare contact list interface

 	if (LoadAddContactModule()) return 1;

 	if (LoadMetacontacts()) return 1;