From e31ac6c82a921e5d972fe3a3d437f18f147877a9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 7 Jun 2013 20:35:29 +0000
Subject: duplicated and unused services removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@4899 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/clist/clcfiledrop.cpp  |  2 +-
 src/modules/clist/clistmod.cpp     |  6 +-----
 src/modules/clist/cluiservices.cpp | 14 --------------
 src/modules/clist/contact.cpp      |  2 --
 4 files changed, 2 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp
index dfd75751ee..cbcf7ca3a5 100644
--- a/src/modules/clist/clcfiledrop.cpp
+++ b/src/modules/clist/clcfiledrop.cpp
@@ -107,7 +107,7 @@ HRESULT CDropTarget::DragOver(DWORD /*grfKeyState*/, POINTL pt, DWORD * pdwEffec
 		*pdwEffect = DROPEFFECT_NONE;
 		return S_OK;
 	}
-	CallService(MS_CLIST_PAUSEAUTOHIDE, 0, 0);
+	cli.pfnTrayIconPauseAutoHide(0, 0);
 	dat = (struct ClcData *) GetWindowLongPtr(hwndCurrentDrag, 0);
 	shortPt.x = pt.x;
 	shortPt.y = pt.y;
diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index 75e63a242f..a7cae8ed75 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -139,7 +139,7 @@ static int ProtocolAck(WPARAM, LPARAM lParam)
 	if (ack->type != ACKTYPE_STATUS)
 		return 0;
 
-	CallService(MS_CLUI_PROTOCOLSTATUSCHANGED, ack->lParam, (LPARAM) ack->szModule);
+	cli.pfnCluiProtocolStatusChanged(lParam, ack->szModule);
 
 	if ((int)ack->hProcess < ID_STATUS_ONLINE && ack->lParam >= ID_STATUS_ONLINE) {
 		DWORD caps = (DWORD)CallProtoServiceInt(NULL,ack->szModule, PS_GETCAPS, PFLAGNUM_1, 0);
@@ -485,8 +485,6 @@ static INT_PTR CompareContacts(WPARAM wParam, LPARAM lParam)
 
 /***************************************************************************************/
 
-static INT_PTR TrayIconProcessMessageStub(WPARAM wParam, LPARAM lParam) {	return cli.pfnTrayIconProcessMessage(wParam, lParam); }
-static INT_PTR TrayIconPauseAutoHideStub(WPARAM wParam, LPARAM lParam) { return cli.pfnTrayIconPauseAutoHide(wParam, lParam); }
 static INT_PTR ShowHideStub(WPARAM wParam, LPARAM lParam) { return cli.pfnShowHide(wParam, lParam); }
 static INT_PTR SetHideOfflineStub(WPARAM wParam, LPARAM lParam) { return cli.pfnSetHideOffline(wParam, lParam); }
 static INT_PTR Docking_ProcessWindowMessageStub(WPARAM wParam, LPARAM lParam) { return cli.pfnDocking_ProcessWindowMessage(wParam, lParam); }
@@ -511,8 +509,6 @@ int LoadContactListModule2(void)
 	CreateServiceFunction(MS_CLIST_GETSTATUSMODEDESCRIPTION, GetStatusModeDescription);
 	CreateServiceFunction(MS_CLIST_GETCONTACTDISPLAYNAME, GetContactDisplayName);
 	CreateServiceFunction(MS_CLIST_INVALIDATEDISPLAYNAME, InvalidateDisplayName);
-	CreateServiceFunction(MS_CLIST_TRAYICONPROCESSMESSAGE, TrayIconProcessMessageStub);
-	CreateServiceFunction(MS_CLIST_PAUSEAUTOHIDE, TrayIconPauseAutoHideStub);
 	CreateServiceFunction(MS_CLIST_CONTACTSCOMPARE, CompareContacts);
 	CreateServiceFunction(MS_CLIST_CONTACTCHANGEGROUP, ContactChangeGroup);
 	CreateServiceFunction(MS_CLIST_SHOWHIDE, ShowHideStub);
diff --git a/src/modules/clist/cluiservices.cpp b/src/modules/clist/cluiservices.cpp
index cc67c14954..1f50dfba8d 100644
--- a/src/modules/clist/cluiservices.cpp
+++ b/src/modules/clist/cluiservices.cpp
@@ -34,18 +34,6 @@ static INT_PTR GetHwndTree(WPARAM, LPARAM)
 	return (INT_PTR)cli.hwndContactTree;
 }
 
-static INT_PTR CluiProtocolStatusChanged(WPARAM wParam, LPARAM lParam)
-{
-	cli.pfnCluiProtocolStatusChanged(wParam, (const char*)lParam);
-	return 0;
-}
-
-INT_PTR SortList(WPARAM, LPARAM)
-{
-	//unnecessary: CLC does this automatically
-	return 0;
-}
-
 static INT_PTR GroupAdded(WPARAM wParam, LPARAM lParam)
 {
 	//CLC does this automatically unless it's a new group
@@ -139,7 +127,6 @@ void LoadCluiServices(void)
 {
 	CreateServiceFunction(MS_CLUI_GETHWND, GetHwnd);
 	CreateServiceFunction(MS_CLUI_GETHWNDTREE, GetHwndTree);
-	CreateServiceFunction(MS_CLUI_PROTOCOLSTATUSCHANGED, CluiProtocolStatusChanged);
 	CreateServiceFunction(MS_CLUI_GROUPADDED, GroupAdded);
 	CreateServiceFunction(MS_CLUI_CONTACTSETICON, ContactSetIcon);
 	CreateServiceFunction(MS_CLUI_CONTACTADDED, ContactAdded);
@@ -147,7 +134,6 @@ void LoadCluiServices(void)
 	CreateServiceFunction(MS_CLUI_CONTACTRENAMED, ContactRenamed);
 	CreateServiceFunction(MS_CLUI_LISTBEGINREBUILD, ListBeginRebuild);
 	CreateServiceFunction(MS_CLUI_LISTENDREBUILD, ListEndRebuild);
-	CreateServiceFunction(MS_CLUI_SORTLIST, SortList);
 	CreateServiceFunction(MS_CLUI_GETCAPS, GetCaps);
 }
 
diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp
index 7671cd2b11..c7daba0d76 100644
--- a/src/modules/clist/contact.cpp
+++ b/src/modules/clist/contact.cpp
@@ -84,7 +84,6 @@ void fnLoadContactTree(void)
 	}
 	sortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
 	sortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
-	CallService(MS_CLUI_SORTLIST, 0, 0);
 	CallService(MS_CLUI_LISTENDREBUILD, 0, 0);
 }
 
@@ -138,7 +137,6 @@ static VOID CALLBACK SortContactsTimer(HWND, UINT, UINT_PTR, DWORD)
 {
 	KillTimer(NULL, resortTimerId);
 	resortTimerId = 0;
-	CallService(MS_CLUI_SORTLIST, 0, 0);
 }
 
 void fnSortContacts(void)
-- 
cgit v1.2.3