From 6ba54d61145df936ec934902fcca87ad352526ad Mon Sep 17 00:00:00 2001
From: MikalaiR <nikolay.romanovich@narod.ru>
Date: Sun, 28 Feb 2016 16:56:12 +0000
Subject: Import: importing all contact settings

git-svn-id: http://svn.miranda-ng.org/main/trunk@16371 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Import/src/import.cpp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'plugins/Import')

diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp
index 73ccd3f47a..6bf2ca229d 100644
--- a/plugins/Import/src/import.cpp
+++ b/plugins/Import/src/import.cpp
@@ -548,6 +548,21 @@ static MCONTACT AddContact(char *szProto, char *pszUniqueSetting, DBVARIANT *id,
 	return hContact;
 }
 
+struct ImportContactData
+{
+	MCONTACT from, to;
+	const char *szBaseProto;
+};
+
+int ModulesEnumProc(const char *szModuleName, DWORD ofsModuleName, LPARAM lParam)
+{
+	ImportContactData *icd = (ImportContactData*)lParam;
+	if (!mir_strcmp(icd->szBaseProto, szModuleName))
+		return 0;
+	CopySettings(icd->from, szModuleName, icd->to, szModuleName);
+	return 0;
+}
+
 void ImportContactSettings(AccountMap *pda, MCONTACT hSrc, MCONTACT hDst)
 {
 	if (pda->pa == NULL)
@@ -555,7 +570,11 @@ void ImportContactSettings(AccountMap *pda, MCONTACT hSrc, MCONTACT hDst)
 
 	char *szDstAcc = pda->pa->szModuleName;
 
-	// Hidden?
+	ImportContactData icd = { hSrc, hDst, pda->szSrcAcc };
+
+	CallService(MS_DB_MODULES_ENUM, (WPARAM)&icd, (LPARAM)ModulesEnumProc);
+
+	/*// Hidden?
 	DBVARIANT dbv;
 	if (!myGet(hSrc, "CList", "Hidden", &dbv)) {
 		db_set(hDst, "CList", "Hidden", &dbv);
@@ -602,7 +621,7 @@ void ImportContactSettings(AccountMap *pda, MCONTACT hSrc, MCONTACT hDst)
 	if (!myGet(hSrc, pda->szSrcAcc, "About", &dbv)) {
 		db_set(hDst, szDstAcc, "About", &dbv);
 		srcDb->FreeVariant(&dbv);
-	}
+	}*/
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3