From a609a99eebd89fca7955c8957fc0f2e99c8ededb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 6 Sep 2016 17:32:37 +0000
Subject: minus MS_CLIST_RETRIEVE_INTERFACE

git-svn-id: http://svn.miranda-ng.org/main/trunk@17267 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_app/src/clistcore.cpp | 10 ++--------
 src/mir_app/src/mir_app.def   |  1 +
 src/mir_app/src/mir_app64.def |  1 +
 src/mir_app/src/modules.cpp   |  2 --
 4 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/mir_app')

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;
 
-- 
cgit v1.2.3