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

---
 protocols/Tox/src/stdafx.h       | 2 +-
 protocols/Tox/src/tox_search.cpp | 7 +------
 protocols/Tox/src/tox_utils.cpp  | 7 +------
 3 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'protocols/Tox/src')

diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h
index 281c585bc5..501eeb96cf 100644
--- a/protocols/Tox/src/stdafx.h
+++ b/protocols/Tox/src/stdafx.h
@@ -23,7 +23,7 @@
 #include <m_popup.h>
 #include <m_icolib.h>
 #include <m_userinfo.h>
-#include <m_addcontact.h>
+#include <m_contacts.h>
 #include <m_message.h>
 #include <m_avatars.h>
 #include <m_skin.h>
diff --git a/protocols/Tox/src/tox_search.cpp b/protocols/Tox/src/tox_search.cpp
index d03d3a091a..d8077fedd1 100644
--- a/protocols/Tox/src/tox_search.cpp
+++ b/protocols/Tox/src/tox_search.cpp
@@ -226,12 +226,7 @@ HWND CToxProto::OnSearchAdvanced(HWND owner)
 		PROTOSEARCHRESULT psr = { sizeof(psr) };
 		psr.flags = PSR_UTF8;
 		psr.id.a = mir_strdup(query.c_str());
-
-		ADDCONTACTSTRUCT acs = { HANDLE_SEARCHRESULT };
-		acs.szProto = m_szModuleName;
-		acs.psr = &psr;
-
-		CallService(MS_ADDCONTACT_SHOW, (WPARAM)owner, (LPARAM)&acs);
+		Contact_AddBySearch(m_szModuleName, &psr, owner);
 
 		ForkThread(&CToxProto::SearchFailedAsync, nullptr);
 	}
diff --git a/protocols/Tox/src/tox_utils.cpp b/protocols/Tox/src/tox_utils.cpp
index 722517c427..130e08eaec 100644
--- a/protocols/Tox/src/tox_utils.cpp
+++ b/protocols/Tox/src/tox_utils.cpp
@@ -165,11 +165,6 @@ INT_PTR CToxProto::ParseToxUri(WPARAM, LPARAM lParam)
 	PROTOSEARCHRESULT psr = { sizeof(psr) };
 	psr.flags = PSR_UTF8;
 	psr.id.a = mir_u2a(&uri[4]);
-
-	ADDCONTACTSTRUCT acs = { HANDLE_SEARCHRESULT };
-	acs.szProto = proto->m_szModuleName;
-	acs.psr = &psr;
-
-	CallService(MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);
+	Contact_AddBySearch(proto->m_szModuleName, &psr);
 	return 0;
 }
-- 
cgit v1.2.3