clist services' extermination continued

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

15 files changed, 19 insertions, 22 deletions

diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp
index 4af8e5ca10..a6424d4c6b 100644
--- a/plugins/AddContactPlus/src/addcontact.cpp
+++ b/plugins/AddContactPlus/src/addcontact.cpp
@@ -282,7 +282,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM)
 				int item = SendDlgItemMessage(hdlg, IDC_GROUP, CB_GETCURSEL, 0, 0);

 				if (item > 0) {

 					item = SendDlgItemMessage(hdlg, IDC_GROUP, CB_GETITEMDATA, item, 0);

-					CallService(MS_CLIST_CONTACTCHANGEGROUP, hContact, item);

+					Clist_ContactChangeGroup(hContact, item);

 				}

 

 				if (BST_UNCHECKED == IsDlgButtonChecked(hdlg, IDC_ADDTEMP)) {

diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp
index 34fa0291a9..bcf588b6a7 100644
--- a/plugins/ContactsPlus/src/receive.cpp
+++ b/plugins/ContactsPlus/src/receive.cpp
@@ -318,13 +318,8 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 								if (!mir_wstrcmp(wndData->maReceived[j]->mcaUIN, caUIN)) {

 									char *szProto =GetContactProto(wndData->mhContact);

 									hContact = (MCONTACT)CallProtoService(szProto, PS_ADDTOLISTBYEVENT, MAKEWPARAM(0, j), (LPARAM)wndData->mhDbEvent);

-									if (hContact && caGroup) {

-										// use newest group API if available

-										if (ServiceExists(MS_CLIST_CONTACTCHANGEGROUP))

-											CallService(MS_CLIST_CONTACTCHANGEGROUP, hContact, (LPARAM)nGroupId);

-										else

-											db_set_ws(hContact, "CList", "Group", caGroup);

-									}

+									if (hContact && caGroup)

+										Clist_ContactChangeGroup(hContact, nGroupId);

 									break;

 								}

 							mir_free(caUIN);

diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp
index 3504975539..0a24b6ecd3 100644
--- a/plugins/FavContacts/src/menu.cpp
+++ b/plugins/FavContacts/src/menu.cpp
@@ -528,7 +528,7 @@ int ShowMenu(bool centered)
 	DestroyMenu(hMenu);

 

 	if (hContact)

-		CallService(MS_CLIST_CONTACTDOUBLECLICKED, hContact, 0);

+		Clist_ContactDoubleClicked(hContact);

 

 	return 0;

 }

diff --git a/plugins/FavContacts/src/services.cpp b/plugins/FavContacts/src/services.cpp
index 2a6cab99c5..acfad2a213 100644
--- a/plugins/FavContacts/src/services.cpp
+++ b/plugins/FavContacts/src/services.cpp
@@ -38,7 +38,7 @@ INT_PTR svcShowMenuCentered(WPARAM, LPARAM)
 INT_PTR svcOpenContact(WPARAM wParam, LPARAM)

 {

 	hContactToActivate = wParam;

-	CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)hContactToActivate, 0);

+	Clist_ContactDoubleClicked(hContactToActivate);

 	return 0;

 }

 

diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp
index 76da433254..2b3fffc4a6 100644
--- a/plugins/FloatingContacts/src/filedrop.cpp
+++ b/plugins/FloatingContacts/src/filedrop.cpp
@@ -163,7 +163,7 @@ BOOL OnDropFiles(HDROP hDrop, ThumbInfo *pThumb)
 

 		ProcessDroppedItems(ppDroppedItems, nDroppedItemsCount, ppFiles);

 

-		bSuccess = (BOOL)CallService(MS_CLIST_CONTACTFILESDROPPED, (WPARAM)pThumb->hContact, (LPARAM)ppFiles);

+		bSuccess = (BOOL)CallService(MS_FILE_SENDSPECIFICFILES, pThumb->hContact, (LPARAM)ppFiles);

 

 		for (UINT iItem = 0; iItem < nFilesCount; ++iItem)

 			free(ppFiles[iItem]);

diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h
index af3decec3f..b983665732 100644
--- a/plugins/FloatingContacts/src/stdafx.h
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -10,6 +10,7 @@
 #include <newpluginapi.h>

 #include <m_system_cpp.h>

 #include <m_skin.h>

+#include <m_file.h>

 #include <m_fontservice.h>

 #include <m_langpack.h>

 #include <m_protosvc.h>

diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp
index e394581046..8fb1a3c5f4 100644
--- a/plugins/FloatingContacts/src/thumbs.cpp
+++ b/plugins/FloatingContacts/src/thumbs.cpp
@@ -661,7 +661,7 @@ void ThumbInfo::UpdateContent()
 

 void ThumbInfo::PopupMessageDialog()

 {

-	CallService(MS_CLIST_CONTACTDOUBLECLICKED, hContact, 0);

+	Clist_ContactDoubleClicked(hContact);

 }

 

 void ThumbInfo::OnTimer(BYTE idTimer)

diff --git a/plugins/NewAwaySysMod/src/ContactList.cpp b/plugins/NewAwaySysMod/src/ContactList.cpp
index a6718e8d2a..8a472008de 100644
--- a/plugins/NewAwaySysMod/src/ContactList.cpp
+++ b/plugins/NewAwaySysMod/src/ContactList.cpp
@@ -458,7 +458,7 @@ int CALLBACK CompareItemsCallback(LPARAM lParam1, LPARAM lParam2, LPARAM lParamS
 	if (IsHContactGroup(dat->Items[lParam2].hContact))

 		return 1;

 	

-	return CallService(MS_CLIST_CONTACTSCOMPARE, dat->Items[lParam1].hContact, dat->Items[lParam2].hContact);

+	return Clist_ContactCompare(dat->Items[lParam1].hContact, dat->Items[lParam2].hContact);

 }

 

 void CCList::SortContacts()

diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp
index 600ef7689e..bc09d7f4aa 100644
--- a/plugins/QuickContacts/src/quickcontacts.cpp
+++ b/plugins/QuickContacts/src/quickcontacts.cpp
@@ -805,7 +805,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				if (hContact == NULL)

 					break;

 

-				CallService(MS_CLIST_CONTACTDOUBLECLICKED, hContact, 0);

+				Clist_ContactDoubleClicked(hContact);

 

 				db_set_dw(NULL, MODULE_NAME, "LastSentTo", hContact);

 				SendMessage(hwndDlg, WM_CLOSE, 0, 0);

diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp
index d3568fc24b..72441c76e9 100644
--- a/plugins/RecentContacts/src/RecentContacts.cpp
+++ b/plugins/RecentContacts/src/RecentContacts.cpp
@@ -109,7 +109,7 @@ BOOL ShowListMainDlgProc_OpenContact(HWND hList, int item)
 		lvi.iSubItem = 0;

 		ListView_GetItem(hList, &lvi);

 		if (lvi.lParam != NULL) {

-			CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)lvi.lParam, NULL);

+			Clist_ContactDoubleClicked(lvi.lParam);

 			return TRUE;

 		}

 	}

diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index 16cd20eff3..92a88a6a9a 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -554,7 +554,7 @@ int LoadSession(WPARAM, LPARAM lparam)
 	// TODO: change to "switch"

 	while (session_list_t[i] != 0) {

 		if (CheckForDuplicate(session_list, session_list_t[i]) == -1)

-			CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)session_list_t[i], 0);

+			Clist_ContactDoubleClicked(session_list_t[i]);

 		else if (g_bWarnOnHidden) {

 			if (!CheckContactVisibility(session_list_t[i])) {

 				hidden[j] = i + 1;

@@ -584,7 +584,7 @@ int LoadSession(WPARAM, LPARAM lparam)
 		if (g_bWarnOnHidden) {

 			if (IDYES == MessageBox(NULL, TranslateT("This Session already opened (but probably hidden).\nDo you want to show hidden contacts?"), TranslateT("Sessions Manager"), MB_YESNO | MB_ICONQUESTION))

 				for (j = 0; hidden[j] != 0; j++)

-					CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)session_list_t[hidden[j] - 1], 0);

+					Clist_ContactDoubleClicked(session_list_t[hidden[j] - 1]);

 		}

 	}

 

diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp
index e984015fe7..fafaf732ed 100644
--- a/plugins/ShellExt/src/shlcom.cpp
+++ b/plugins/ShellExt/src/shlcom.cpp
@@ -183,7 +183,7 @@ struct TSlotInfo
 

 int __cdecl SortContact(const void *Item1, const void *Item2)

 {

-	return CallService(MS_CLIST_CONTACTSCOMPARE, ((TSlotInfo*)Item1)->hContact, ((TSlotInfo*)Item2)->hContact);

+	return Clist_ContactCompare(((TSlotInfo*)Item1)->hContact, ((TSlotInfo*)Item2)->hContact);

 }

 

 void ipcGetSkinIcons(THeaderIPC *ipch)

diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index eef1b2a6a1..35233489fd 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -124,7 +124,7 @@ void TSAPI HandleMenuEntryFromhContact(MCONTACT hContact)
 		}

 	}

 

-	CallService(MS_CLIST_CONTACTDOUBLECLICKED, hContact, 0);

+	Clist_ContactDoubleClicked(hContact);

 }

 

 void TSAPI DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, DWORD dwIdle)

@@ -529,7 +529,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		{

 			FLASH_PARAMS *p = reinterpret_cast<FLASH_PARAMS*>(lParam);

 			if (1 == wParam) {

-				CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)p->hContact, 1);

+				Clist_ContactDoubleClicked(p->hContact);

 				p->bActiveTab = TRUE;

 				p->bInactive = FALSE;

 				p->bMustAutoswitch = p->bMustFlash = FALSE;

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index cd774894b7..3008beffb2 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -863,7 +863,8 @@ void CTooltipNotify::OnTooltipDblClicked(CTooltip *pTooltip)
 			TooltipsList::iterator iter = FindBy(&STooltipData::pTooltip, pTooltip);

 			STooltipData* pTooltipData = *iter;

 			WPARAM wParam = (WPARAM)pTooltipData->hContact;

-			if (wParam)	::CallService(MS_CLIST_CONTACTDOUBLECLICKED, wParam, 0);

+			if (wParam)

+				Clist_ContactDoubleClicked(wParam);

 			break;

 		}

 

diff --git a/plugins/Utils.pas/mircontacts.pas b/plugins/Utils.pas/mircontacts.pas
index 43abcda5ba..0863c0cd35 100644
--- a/plugins/Utils.pas/mircontacts.pas
+++ b/plugins/Utils.pas/mircontacts.pas
@@ -471,7 +471,7 @@ CallService(MS_CLIST_CONTACTDOUBLECLICKED,hContact,0);
         end;

         if anystatus then

         begin

-          CallService(MS_CLIST_CONTACTDOUBLECLICKED,hContact,0); //??

+          Clist_ContactDoubleClicked(hContact);

         // if chat exist, open chat

         // else create new session

         end;