From e1a3a426a742028570baaee7430b2b5750734e4c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 27 Dec 2017 17:19:20 +0300
Subject: obsolete structure ADDCONTACTSTRUCT, service MS_ADDCONTACT_SHOW and
 whole m_addcontact.h removed and replaced with Contact_Add* functions

---
 plugins/ContactsPlus/src/receive.cpp | 4 ++--
 plugins/ContactsPlus/src/send.cpp    | 2 +-
 plugins/ContactsPlus/src/stdafx.h    | 2 +-
 plugins/ContactsPlus/src/utils.cpp   | 9 ---------
 plugins/ContactsPlus/src/utils.h     | 2 --
 5 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'plugins/ContactsPlus')

diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp
index 67b2290358..5b919d71fe 100644
--- a/plugins/ContactsPlus/src/receive.cpp
+++ b/plugins/ContactsPlus/src/receive.cpp
@@ -355,7 +355,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			case ID_POPUP_ADDUSER:
 				hContact = CreateTemporaryContactForItem(hwndDlg, wndData, wndData->iPopupItem);
 				if (hContact)
-					DialogAddContactExecute(hwndDlg, hContact);
+					Contact_Add(hContact, hwndDlg);
 				break;
 
 			case ID_POPUP_USERDETAILS:
@@ -389,7 +389,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 				break;
 
 			case IDC_ADD:
-				DialogAddContactExecute(hwndDlg, wndData->mhContact);
+				Contact_Add(wndData->mhContact, hwndDlg);
 				break;
 			}
 		}
diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp
index 9887b10071..6176597a39 100644
--- a/plugins/ContactsPlus/src/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
@@ -372,7 +372,7 @@ INT_PTR CALLBACK SendDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			break;
 
 		case IDC_ADD:
-			DialogAddContactExecute(hwndDlg, wndData->hContact);
+			Contact_Add(wndData->hContact, hwndDlg);
 			break;
 		}
 		break;
diff --git a/plugins/ContactsPlus/src/stdafx.h b/plugins/ContactsPlus/src/stdafx.h
index 14b3a280b9..6ae4c02e89 100644
--- a/plugins/ContactsPlus/src/stdafx.h
+++ b/plugins/ContactsPlus/src/stdafx.h
@@ -35,7 +35,7 @@
 #include "m_clist.h"
 #include "m_clistint.h"
 #include "m_clc.h"
-#include "m_addcontact.h"
+#include "m_contacts.h"
 #include "m_history.h"
 #include "m_userinfo.h"
 #include "m_button.h"
diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index c6c079cf3a..acc2c47a16 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -87,15 +87,6 @@ wchar_t* GetContactUID(MCONTACT hContact)
 	return nullptr;
 }
 
-void DialogAddContactExecute(HWND hwndDlg, MCONTACT hNewContact)
-{
-	ADDCONTACTSTRUCT acs = { 0 };
-	acs.hContact = hNewContact;
-	acs.handleType = HANDLE_CONTACT;
-	CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);
-}
-
-
 void DrawProtocolIcon(HWND hwndDlg, LPARAM lParam, MCONTACT hContact)
 {
 	LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;
diff --git a/plugins/ContactsPlus/src/utils.h b/plugins/ContactsPlus/src/utils.h
index 01eee73411..6a15ed06c9 100644
--- a/plugins/ContactsPlus/src/utils.h
+++ b/plugins/ContactsPlus/src/utils.h
@@ -40,8 +40,6 @@ void UpdateDialogAddButton(HWND hwndDlg, MCONTACT hContact);
 
 HICON InitMButton(HWND hDlg, int idButton, int idIcon, wchar_t *szTip);
 
-void DialogAddContactExecute(HWND hwndDlg, MCONTACT hNewContact);
-
 HICON LoadContactProtoIcon(MCONTACT hContact);
 
 void EnableDlgItem(HWND hwndDlg, UINT control, int state);
-- 
cgit v1.2.3