- added import's icon to icolib

- minor code reordering

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

6 files changed, 446 insertions, 423 deletions

diff --git a/plugins/Import/import_10.vcxproj b/plugins/Import/import_10.vcxproj
index 55f52a577a..348b48c382 100644
--- a/plugins/Import/import_10.vcxproj
+++ b/plugins/Import/import_10.vcxproj
@@ -204,6 +204,9 @@
     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="..\Utils\mir_icons.cpp">

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

+    </ClCompile>

     <ClCompile Include="src\ICQserver.cpp" />

     <ClCompile Include="src\main.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

@@ -211,6 +214,7 @@
     <ClCompile Include="src\mirabilis.cpp" />

     <ClCompile Include="src\miranda.cpp" />

     <ClCompile Include="src\progress.cpp" />

+    <ClCompile Include="src\utils.cpp" />

     <ClCompile Include="src\wizard.cpp" />

   </ItemGroup>

   <ItemGroup>

diff --git a/plugins/Import/import_10.vcxproj.filters b/plugins/Import/import_10.vcxproj.filters
index 33a708cb33..0c89a67229 100644
--- a/plugins/Import/import_10.vcxproj.filters
+++ b/plugins/Import/import_10.vcxproj.filters
@@ -36,6 +36,12 @@
     <ClCompile Include="src\wizard.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\utils.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\Utils\mir_icons.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\ICQserver.h">

diff --git a/plugins/Import/src/import.h b/plugins/Import/src/import.h
index d0cb865c02..f0d9b022bd 100644
--- a/plugins/Import/src/import.h
+++ b/plugins/Import/src/import.h
@@ -101,6 +101,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 void AddMessage( const char* fmt, ... );

 

+void FreeVariant( DBVARIANT* dbv );

+void WriteVariant( HANDLE hContact, const char* module, const char* var, DBVARIANT* dbv );

+

 int CreateGroup(BYTE type, const char* name, HANDLE hContact);

 

 extern HWND hdlgProgress;

diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp
index ebb2f9add2..89d3320d32 100644
--- a/plugins/Import/src/main.cpp
+++ b/plugins/Import/src/main.cpp
@@ -24,28 +24,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "version.h"

 #include "resource.h"

 

-void FreeVariant( DBVARIANT* dbv );

-void WriteVariant( HANDLE hContact, const char* module, const char* var, DBVARIANT* dbv );

-

-BOOL IsDuplicateEvent(HANDLE hContact, DBEVENTINFO dbei);

-

+#include "..\..\Utils\mir_icons.h"

 

 int nImportOption;

 int nCustomOptions;

 

-int      cICQAccounts = 0;

-char  ** szICQModuleName = NULL;

-TCHAR ** tszICQAccountName = NULL;

-int      iICQAccount = 0;

-

-static HANDLE hHookModulesLoaded = NULL;

-static HANDLE hHookOnExit = NULL;

 static HANDLE hImportService = NULL;

 

-

-INT_PTR CALLBACK WizardDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

-

 HINSTANCE hInst;

+DLGPROC WizardDlgProc;

 

 static HWND hwndWizard = NULL;

 int hLangpack;

@@ -98,16 +85,14 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_IMPORT,
 

 static int ModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

-	int nProtocols = 0;

-	int n;

-	PROTOCOLDESCRIPTOR **ppProtos = NULL;

-

 	if (DBGetContactSettingByte(NULL, IMPORT_MODULE, IMP_KEY_FR, 0))

 		return 0;

 

 	// Only autorun import wizard if at least one protocol is installed

+	int nProtocols = 0;

+	PROTOCOLDESCRIPTOR **ppProtos = NULL;

 	CallService(MS_PROTO_ENUMPROTOCOLS, (WPARAM)&nProtocols, (LPARAM)&ppProtos);

-	for (n=0; n < nProtocols; n++) {

+	for (int n=0; n < nProtocols; n++) {

 		if (ppProtos[n]->type == PROTOTYPE_PROTOCOL) {

 			CallService(IMPORT_SERVICE, 0, 0);

 			DBWriteContactSettingByte(NULL, IMPORT_MODULE, IMP_KEY_FR, 1);

@@ -128,25 +113,24 @@ extern "C" __declspec(dllexport) int Load(void)
 	mir_getLP( &pluginInfo );

 

 	hImportService = CreateServiceFunction(IMPORT_SERVICE, ImportCommand);

-	{

-		CLISTMENUITEM mi;

-		ZeroMemory(&mi, sizeof(mi));

-		mi.cbSize = sizeof(mi);

-		mi.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_IMPORT));

-		mi.pszName = LPGEN("&Import...");

-		mi.position = 500050000;

-		mi.pszService = IMPORT_SERVICE;

-		Menu_AddMainMenuItem(&mi);

-	}

-	hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

-	hHookOnExit = HookEvent(ME_SYSTEM_OKTOEXIT, OnExit);

-	{

-		INITCOMMONCONTROLSEX icex;

-		icex.dwSize = sizeof(icex);

-		icex.dwICC = ICC_DATE_CLASSES;

-		InitCommonControlsEx(&icex);

-	}

-

+	

+	CLISTMENUITEM mi;

+	ZeroMemory(&mi, sizeof(mi));

+	mi.cbSize = sizeof(mi);

+	mi.icolibItem = IcoLib_Register("import_main", "Import", LPGEN("Import..."), IDI_IMPORT);

+	mi.pszName = LPGEN("&Import...");

+	mi.position = 500050000;

+	mi.pszService = IMPORT_SERVICE;

+	mi.flags = CMIF_ICONFROMICOLIB;

+	Menu_AddMainMenuItem(&mi);

+

+	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

+	HookEvent(ME_SYSTEM_OKTOEXIT, OnExit);

+	

+	INITCOMMONCONTROLSEX icex;

+	icex.dwSize = sizeof(icex);

+	icex.dwICC = ICC_DATE_CLASSES;

+	InitCommonControlsEx(&icex);

 	return 0;

 }

 

@@ -155,389 +139,8 @@ extern "C" __declspec(dllexport) int Load(void)
 

 extern "C" __declspec(dllexport) int Unload(void)

 {

-	if (hHookModulesLoaded)

-		UnhookEvent(hHookModulesLoaded);

-	if (hHookOnExit)

-		UnhookEvent(hHookOnExit);

 	if (hImportService)

 		DestroyServiceFunction(hImportService);

 

 	return 0;

 }

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

-BOOL IsProtocolLoaded(char* pszProtocolName)

-{

-	return CallService(MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)pszProtocolName) ? TRUE : FALSE;

-}

-

-BOOL EnumICQAccounts()

-{

-	int count, i = 0;

-	PROTOACCOUNT ** accs;

-	

-	while (cICQAccounts)

-	{

-		cICQAccounts--;

-		free(szICQModuleName[cICQAccounts]);

-		free(tszICQAccountName[cICQAccounts]);

-	}

-	

-	ProtoEnumAccounts(&count, &accs);

-	szICQModuleName   = (char**)realloc(szICQModuleName, count * sizeof(char**));

-	tszICQAccountName = (TCHAR**)realloc(tszICQAccountName, count * sizeof(TCHAR**));

-	while (i < count)

-	{

-		if ((0 == strcmp(ICQOSCPROTONAME, accs[i]->szProtoName)) && accs[i]->bIsEnabled)

-		{

-			szICQModuleName[cICQAccounts] = strdup(accs[i]->szModuleName);

-			tszICQAccountName[cICQAccounts] = _tcsdup(accs[i]->tszAccountName);

-			cICQAccounts++;

-		}

-		i++;

-	}

-	return cICQAccounts != 0;

-}

-

-void FreeICQAccountsList()

-{

-	while (cICQAccounts)

-	{

-		cICQAccounts--;

-		free(szICQModuleName[cICQAccounts]);

-		free(tszICQAccountName[cICQAccounts]);

-	}

-

-	if (szICQModuleName)

-		free(szICQModuleName);

-	if (tszICQAccountName)

-		free(tszICQAccountName);

-

-	szICQModuleName = NULL;

-	tszICQAccountName = NULL;

-}

-

-HANDLE HContactFromNumericID(char* pszProtoName, char* pszSetting, DWORD dwID)

-{

-	char* szProto;

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

-	while (hContact != NULL)

-	{

-		if (DBGetContactSettingDword(hContact, pszProtoName, pszSetting, 0) == dwID)

-		{

-			szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

-			if (szProto != NULL && !strcmp(szProto, pszProtoName))

-				return hContact;

-		}

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

-	}

-	return INVALID_HANDLE_VALUE;

-}

-

-HANDLE HContactFromID(char* pszProtoName, char* pszSetting, char* pszID)

-{

-	DBVARIANT dbv;

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

-	while (hContact != NULL) {

-		char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

-		if ( !lstrcmpA(szProto, pszProtoName)) {

-			if (DBGetContactSettingString(hContact, pszProtoName, pszSetting, &dbv) == 0) {

-				if (strcmp(pszID, dbv.pszVal) == 0) {

-					DBFreeVariant(&dbv);

-					return hContact;

-				}

-				DBFreeVariant(&dbv);

-			}

-		}

-

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

-	}

-	return INVALID_HANDLE_VALUE;

-}

-

-HANDLE HistoryImportFindContact(HWND hdlgProgress, char* szModuleName, DWORD uin, int addUnknown)

-{

-	HANDLE hContact = HContactFromNumericID(szModuleName, "UIN", uin);

-	if (hContact == NULL) {

-		AddMessage( LPGEN("Ignored event from/to self"));

-		return INVALID_HANDLE_VALUE;

-	}

-

-	if (hContact != INVALID_HANDLE_VALUE)

-		return hContact;

-

-	if (!addUnknown)

-		return INVALID_HANDLE_VALUE;

-

-	hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);

-	CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)szModuleName);

-	DBWriteContactSettingDword(hContact, szModuleName, "UIN", uin);

-	AddMessage( LPGEN("Added contact %u (found in history)"), uin );

-	return hContact;

-}

-

-HANDLE AddContact(HWND hdlgProgress, char* pszProtoName, char* pszUniqueSetting,

-						DBVARIANT* id, DBVARIANT* nick, DBVARIANT* group)

-{

-	HANDLE hContact;

-	char szid[ 40 ];

-	char* pszUserID = ( id->type == DBVT_DWORD ) ? _ltoa( id->dVal, szid, 10 ) : id->pszVal;

-

-	hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);

-	if ( CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)pszProtoName) != 0) {

-		CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

-		AddMessage( LPGEN("Failed to add %s contact %s"), pszProtoName, pszUserID );

-		FreeVariant( id );

-		FreeVariant( nick );

-		FreeVariant( group );

-		return INVALID_HANDLE_VALUE;

-	}

-

-	WriteVariant( hContact, pszProtoName, pszUniqueSetting, id );

-

-	if ( group->type )

-		CreateGroup( group->type, group->pszVal, hContact );

-

-	if ( nick->type && nick->pszVal[0] ) {

-		WriteVariant( hContact, "CList", "MyHandle", nick );

-		if (nick->type == DBVT_UTF8) {

-			char *tmp = mir_utf8decodeA(nick->pszVal);

-			AddMessage( LPGEN("Added %s contact %s, '%s'"), pszProtoName, pszUserID, tmp );

-			mir_free(tmp);

-		}

-		else AddMessage( LPGEN("Added %s contact %s, '%s'"), pszProtoName, pszUserID, nick->pszVal );

-	}

-	else AddMessage( LPGEN("Added %s contact %s"), pszProtoName, pszUserID );

-

-	FreeVariant( id );

-	FreeVariant( nick );

-	FreeVariant( group );

-	return hContact;

-}

-

-// ------------------------------------------------

-// Creates a group with a specified name in the

-// Miranda contact list.

-// If contact is specified adds it to group

-// ------------------------------------------------

-// Returns 1 if successful and 0 when it fails.

-int CreateGroup(BYTE type, const char* name, HANDLE hContact)

-{

-	int groupId;

-	TCHAR *tmp, *tszGrpName;

-	char groupIdStr[11];

-	size_t cbName;

-

-	if (type == DBVT_UTF8)

-		tmp = mir_utf8decodeT( name );

-    else if (type == DBVT_WCHAR)

-        tmp = mir_u2t(( wchar_t* )name );

-    else

-		tmp = mir_a2t( name );

-

-	if ( tmp == NULL )

-		return 0;

-

-	cbName = _tcslen(tmp);

-	tszGrpName = (TCHAR*)_alloca(( cbName+2 )*sizeof( TCHAR ));

-	tszGrpName[0] = 1 | GROUPF_EXPANDED;

-	_tcscpy( tszGrpName+1, tmp );

-	mir_free( tmp );

-

-	// Check for duplicate & find unused id

-	for (groupId = 0; ; groupId++) {

-		DBVARIANT dbv;

-		itoa(groupId, groupIdStr,10);

-		if (DBGetContactSettingTString(NULL, "CListGroups", groupIdStr, &dbv))

-			break;

-

-		if ( !lstrcmp(dbv.ptszVal + 1, tszGrpName + 1 )) {

-			if (hContact)

-		        DBWriteContactSettingTString( hContact, "CList", "Group", tszGrpName+1 );

-			else {

-				char *str = mir_t2a(tszGrpName + 1);

-				AddMessage( LPGEN("Skipping duplicate group %s."), str);

-				mir_free(str);

-			}

-

-			DBFreeVariant(&dbv);

-			return 0;

-		}

-

-		DBFreeVariant(&dbv);

-	}

-

-	DBWriteContactSettingTString( NULL, "CListGroups", groupIdStr, tszGrpName );

-

-	if (hContact) 

-		DBWriteContactSettingTString( hContact, "CList", "Group", tszGrpName+1 );

-

-	return 1;

-}

-

-// Returns TRUE if the event already exist in the database

-BOOL IsDuplicateEvent(HANDLE hContact, DBEVENTINFO dbei)

-{

-	static DWORD dwPreviousTimeStamp = -1;

-	static HANDLE hPreviousContact = INVALID_HANDLE_VALUE;

-	static HANDLE hPreviousDbEvent = NULL;

-

-	HANDLE hExistingDbEvent;

-	DWORD dwEventTimeStamp;

-	DBEVENTINFO dbeiExisting;

-

-	// get last event

-	if (!(hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDLAST, (WPARAM)hContact, 0)))

-		return FALSE;

-

-	ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

-	dbeiExisting.cbSize = sizeof(dbeiExisting);

-	CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

-	dwEventTimeStamp = dbeiExisting.timestamp;

-

-	// compare with last timestamp

-	if (dbei.timestamp > dwEventTimeStamp)

-	{

-		// remember event

-		hPreviousDbEvent = hExistingDbEvent;

-		dwPreviousTimeStamp = dwEventTimeStamp;

-		return FALSE;

-	}

-

-	if (hContact != hPreviousContact)

-	{

-		hPreviousContact = hContact;

-		// remember event

-		hPreviousDbEvent = hExistingDbEvent;

-		dwPreviousTimeStamp = dwEventTimeStamp;

-

-   		// get first event

-		if (!(hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDFIRST, (WPARAM)hContact, 0)))

-			return FALSE;

-

-		ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

-		dbeiExisting.cbSize = sizeof(dbeiExisting);

-		CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

-		dwEventTimeStamp = dbeiExisting.timestamp;

-

-		// compare with first timestamp

-		if (dbei.timestamp <= dwEventTimeStamp)

-		{

-		    // remember event

-			dwPreviousTimeStamp = dwEventTimeStamp;

-			hPreviousDbEvent = hExistingDbEvent;

-

-			if ( dbei.timestamp != dwEventTimeStamp )

-				return FALSE;

-		}

-

-	}

-	// check for equal timestamps

-	if (dbei.timestamp == dwPreviousTimeStamp)

-	{

-		ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

-		dbeiExisting.cbSize = sizeof(dbeiExisting);

-		CallService(MS_DB_EVENT_GET, (WPARAM)hPreviousDbEvent, (LPARAM)&dbeiExisting);

-

-		if ((dbei.timestamp == dbeiExisting.timestamp) &&

-			(dbei.eventType == dbeiExisting.eventType) &&

-			(dbei.cbBlob == dbeiExisting.cbBlob) &&

-			((dbei.flags&DBEF_SENT) == (dbeiExisting.flags&DBEF_SENT)))

-    		return TRUE;

-

-		// find event with another timestamp

-		hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT, (WPARAM)hPreviousDbEvent, 0);

-		while (hExistingDbEvent != NULL)

-		{

-			ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

-			dbeiExisting.cbSize = sizeof(dbeiExisting);

-			CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

-

-			if (dbeiExisting.timestamp != dwPreviousTimeStamp)

-			{

-				// use found event

-				hPreviousDbEvent = hExistingDbEvent;

-				dwPreviousTimeStamp = dbeiExisting.timestamp;

-				break;

-			}

-

-			hPreviousDbEvent = hExistingDbEvent;

-			hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT, (WPARAM)hExistingDbEvent, 0);

-		}

-	}

-

-	hExistingDbEvent = hPreviousDbEvent;

-

-	if (dbei.timestamp <= dwPreviousTimeStamp)

-	{

-		// look back

-		while (hExistingDbEvent != NULL)

-		{

-			ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

-			dbeiExisting.cbSize = sizeof(dbeiExisting);

-			CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

-

-			if (dbei.timestamp > dbeiExisting.timestamp)

-			{

-			    // remember event

-				hPreviousDbEvent = hExistingDbEvent;

-				dwPreviousTimeStamp = dbeiExisting.timestamp;

-				return FALSE;

-			}

-

-			// Compare event with import candidate

-			if ((dbei.timestamp == dbeiExisting.timestamp) &&

-				(dbei.eventType == dbeiExisting.eventType) &&

-				(dbei.cbBlob == dbeiExisting.cbBlob) &&

-				((dbei.flags&DBEF_SENT) == (dbeiExisting.flags&DBEF_SENT)))

-			{

-				// remember event

-				hPreviousDbEvent = hExistingDbEvent;

-				dwPreviousTimeStamp = dbeiExisting.timestamp;

-				return TRUE;

-			}

-

-			// Get previous event in chain

-			hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDPREV, (WPARAM)hExistingDbEvent, 0);

-		}

-

-    }

-    else

-    {

-		// look forward

-		while (hExistingDbEvent != NULL)

-		{

-			ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

-			dbeiExisting.cbSize = sizeof(dbeiExisting);

-			CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

-

-			if (dbei.timestamp < dbeiExisting.timestamp)

-			{

-			    // remember event

-				hPreviousDbEvent = hExistingDbEvent;

-				dwPreviousTimeStamp = dbeiExisting.timestamp;

-				return FALSE;

-			}

-

-			// Compare event with import candidate

-			if ((dbei.timestamp == dbeiExisting.timestamp) &&

-				(dbei.eventType == dbeiExisting.eventType) &&

-				(dbei.cbBlob == dbeiExisting.cbBlob) &&

-				((dbei.flags&DBEF_SENT) == (dbeiExisting.flags&DBEF_SENT)))

-			{

-				// remember event

-				hPreviousDbEvent = hExistingDbEvent;

-				dwPreviousTimeStamp = dbeiExisting.timestamp;

-				return TRUE;

-			}

-

-			// Get next event in chain

-			hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT, (WPARAM)hExistingDbEvent, 0);

-		}

-

-	}

-	// reset last event

-	hPreviousContact = INVALID_HANDLE_VALUE;

-	return FALSE;

-}

diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp
new file mode 100644
index 0000000000..0e57e2479f
--- /dev/null
+++ b/plugins/Import/src/utils.cpp
@@ -0,0 +1,407 @@
+/*

+

+Import plugin for Miranda IM

+

+Copyright (C) 2001-2005 Martin Öberg, Richard Hughes, Roland Rabien & Tristan Van de Vreede

+

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation; either version 2

+of the License, or (at your option) any later version.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program; if not, write to the Free Software

+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+

+*/

+

+#include "import.h"

+#include "version.h"

+#include "resource.h"

+

+int      cICQAccounts = 0;

+char  ** szICQModuleName = NULL;

+TCHAR ** tszICQAccountName = NULL;

+int      iICQAccount = 0;

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

+BOOL IsProtocolLoaded(char* pszProtocolName)

+{

+	return CallService(MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)pszProtocolName) ? TRUE : FALSE;

+}

+

+BOOL EnumICQAccounts()

+{

+	int count, i = 0;

+	PROTOACCOUNT ** accs;

+

+	while (cICQAccounts)

+	{

+		cICQAccounts--;

+		free(szICQModuleName[cICQAccounts]);

+		free(tszICQAccountName[cICQAccounts]);

+	}

+

+	ProtoEnumAccounts(&count, &accs);

+	szICQModuleName   = (char**)realloc(szICQModuleName, count * sizeof(char**));

+	tszICQAccountName = (TCHAR**)realloc(tszICQAccountName, count * sizeof(TCHAR**));

+	while (i < count)

+	{

+		if ((0 == strcmp(ICQOSCPROTONAME, accs[i]->szProtoName)) && accs[i]->bIsEnabled)

+		{

+			szICQModuleName[cICQAccounts] = strdup(accs[i]->szModuleName);

+			tszICQAccountName[cICQAccounts] = _tcsdup(accs[i]->tszAccountName);

+			cICQAccounts++;

+		}

+		i++;

+	}

+	return cICQAccounts != 0;

+}

+

+void FreeICQAccountsList()

+{

+	while (cICQAccounts)

+	{

+		cICQAccounts--;

+		free(szICQModuleName[cICQAccounts]);

+		free(tszICQAccountName[cICQAccounts]);

+	}

+

+	if (szICQModuleName)

+		free(szICQModuleName);

+	if (tszICQAccountName)

+		free(tszICQAccountName);

+

+	szICQModuleName = NULL;

+	tszICQAccountName = NULL;

+}

+

+HANDLE HContactFromNumericID(char* pszProtoName, char* pszSetting, DWORD dwID)

+{

+	char* szProto;

+	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	while (hContact != NULL)

+	{

+		if (DBGetContactSettingDword(hContact, pszProtoName, pszSetting, 0) == dwID)

+		{

+			szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+			if (szProto != NULL && !strcmp(szProto, pszProtoName))

+				return hContact;

+		}

+		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+	}

+	return INVALID_HANDLE_VALUE;

+}

+

+HANDLE HContactFromID(char* pszProtoName, char* pszSetting, char* pszID)

+{

+	DBVARIANT dbv;

+	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	while (hContact != NULL) {

+		char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+		if ( !lstrcmpA(szProto, pszProtoName)) {

+			if (DBGetContactSettingString(hContact, pszProtoName, pszSetting, &dbv) == 0) {

+				if (strcmp(pszID, dbv.pszVal) == 0) {

+					DBFreeVariant(&dbv);

+					return hContact;

+				}

+				DBFreeVariant(&dbv);

+			}

+		}

+

+		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+	}

+	return INVALID_HANDLE_VALUE;

+}

+

+HANDLE HistoryImportFindContact(HWND hdlgProgress, char* szModuleName, DWORD uin, int addUnknown)

+{

+	HANDLE hContact = HContactFromNumericID(szModuleName, "UIN", uin);

+	if (hContact == NULL) {

+		AddMessage( LPGEN("Ignored event from/to self"));

+		return INVALID_HANDLE_VALUE;

+	}

+

+	if (hContact != INVALID_HANDLE_VALUE)

+		return hContact;

+

+	if (!addUnknown)

+		return INVALID_HANDLE_VALUE;

+

+	hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);

+	CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)szModuleName);

+	DBWriteContactSettingDword(hContact, szModuleName, "UIN", uin);

+	AddMessage( LPGEN("Added contact %u (found in history)"), uin );

+	return hContact;

+}

+

+HANDLE AddContact(HWND hdlgProgress, char* pszProtoName, char* pszUniqueSetting,

+						DBVARIANT* id, DBVARIANT* nick, DBVARIANT* group)

+{

+	HANDLE hContact;

+	char szid[ 40 ];

+	char* pszUserID = ( id->type == DBVT_DWORD ) ? _ltoa( id->dVal, szid, 10 ) : id->pszVal;

+

+	hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);

+	if ( CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)pszProtoName) != 0) {

+		CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

+		AddMessage( LPGEN("Failed to add %s contact %s"), pszProtoName, pszUserID );

+		FreeVariant( id );

+		FreeVariant( nick );

+		FreeVariant( group );

+		return INVALID_HANDLE_VALUE;

+	}

+

+	WriteVariant( hContact, pszProtoName, pszUniqueSetting, id );

+

+	if ( group->type )

+		CreateGroup( group->type, group->pszVal, hContact );

+

+	if ( nick->type && nick->pszVal[0] ) {

+		WriteVariant( hContact, "CList", "MyHandle", nick );

+		if (nick->type == DBVT_UTF8) {

+			char *tmp = mir_utf8decodeA(nick->pszVal);

+			AddMessage( LPGEN("Added %s contact %s, '%s'"), pszProtoName, pszUserID, tmp );

+			mir_free(tmp);

+		}

+		else AddMessage( LPGEN("Added %s contact %s, '%s'"), pszProtoName, pszUserID, nick->pszVal );

+	}

+	else AddMessage( LPGEN("Added %s contact %s"), pszProtoName, pszUserID );

+

+	FreeVariant( id );

+	FreeVariant( nick );

+	FreeVariant( group );

+	return hContact;

+}

+

+// ------------------------------------------------

+// Creates a group with a specified name in the

+// Miranda contact list.

+// If contact is specified adds it to group

+// ------------------------------------------------

+// Returns 1 if successful and 0 when it fails.

+int CreateGroup(BYTE type, const char* name, HANDLE hContact)

+{

+	int groupId;

+	TCHAR *tmp, *tszGrpName;

+	char groupIdStr[11];

+	size_t cbName;

+

+	if (type == DBVT_UTF8)

+		tmp = mir_utf8decodeT( name );

+    else if (type == DBVT_WCHAR)

+        tmp = mir_u2t(( wchar_t* )name );

+    else

+		tmp = mir_a2t( name );

+

+	if ( tmp == NULL )

+		return 0;

+

+	cbName = _tcslen(tmp);

+	tszGrpName = (TCHAR*)_alloca(( cbName+2 )*sizeof( TCHAR ));

+	tszGrpName[0] = 1 | GROUPF_EXPANDED;

+	_tcscpy( tszGrpName+1, tmp );

+	mir_free( tmp );

+

+	// Check for duplicate & find unused id

+	for (groupId = 0; ; groupId++) {

+		DBVARIANT dbv;

+		itoa(groupId, groupIdStr,10);

+		if (DBGetContactSettingTString(NULL, "CListGroups", groupIdStr, &dbv))

+			break;

+

+		if ( !lstrcmp(dbv.ptszVal + 1, tszGrpName + 1 )) {

+			if (hContact)

+		        DBWriteContactSettingTString( hContact, "CList", "Group", tszGrpName+1 );

+			else {

+				char *str = mir_t2a(tszGrpName + 1);

+				AddMessage( LPGEN("Skipping duplicate group %s."), str);

+				mir_free(str);

+			}

+

+			DBFreeVariant(&dbv);

+			return 0;

+		}

+

+		DBFreeVariant(&dbv);

+	}

+

+	DBWriteContactSettingTString( NULL, "CListGroups", groupIdStr, tszGrpName );

+

+	if (hContact)

+		DBWriteContactSettingTString( hContact, "CList", "Group", tszGrpName+1 );

+

+	return 1;

+}

+

+// Returns TRUE if the event already exist in the database

+BOOL IsDuplicateEvent(HANDLE hContact, DBEVENTINFO dbei)

+{

+	static DWORD dwPreviousTimeStamp = -1;

+	static HANDLE hPreviousContact = INVALID_HANDLE_VALUE;

+	static HANDLE hPreviousDbEvent = NULL;

+

+	HANDLE hExistingDbEvent;

+	DWORD dwEventTimeStamp;

+	DBEVENTINFO dbeiExisting;

+

+	// get last event

+	if (!(hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDLAST, (WPARAM)hContact, 0)))

+		return FALSE;

+

+	ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

+	dbeiExisting.cbSize = sizeof(dbeiExisting);

+	CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

+	dwEventTimeStamp = dbeiExisting.timestamp;

+

+	// compare with last timestamp

+	if (dbei.timestamp > dwEventTimeStamp)

+	{

+		// remember event

+		hPreviousDbEvent = hExistingDbEvent;

+		dwPreviousTimeStamp = dwEventTimeStamp;

+		return FALSE;

+	}

+

+	if (hContact != hPreviousContact)

+	{

+		hPreviousContact = hContact;

+		// remember event

+		hPreviousDbEvent = hExistingDbEvent;

+		dwPreviousTimeStamp = dwEventTimeStamp;

+

+   		// get first event

+		if (!(hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDFIRST, (WPARAM)hContact, 0)))

+			return FALSE;

+

+		ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

+		dbeiExisting.cbSize = sizeof(dbeiExisting);

+		CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

+		dwEventTimeStamp = dbeiExisting.timestamp;

+

+		// compare with first timestamp

+		if (dbei.timestamp <= dwEventTimeStamp)

+		{

+		    // remember event

+			dwPreviousTimeStamp = dwEventTimeStamp;

+			hPreviousDbEvent = hExistingDbEvent;

+

+			if ( dbei.timestamp != dwEventTimeStamp )

+				return FALSE;

+		}

+

+	}

+	// check for equal timestamps

+	if (dbei.timestamp == dwPreviousTimeStamp)

+	{

+		ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

+		dbeiExisting.cbSize = sizeof(dbeiExisting);

+		CallService(MS_DB_EVENT_GET, (WPARAM)hPreviousDbEvent, (LPARAM)&dbeiExisting);

+

+		if ((dbei.timestamp == dbeiExisting.timestamp) &&

+			(dbei.eventType == dbeiExisting.eventType) &&

+			(dbei.cbBlob == dbeiExisting.cbBlob) &&

+			((dbei.flags&DBEF_SENT) == (dbeiExisting.flags&DBEF_SENT)))

+    		return TRUE;

+

+		// find event with another timestamp

+		hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT, (WPARAM)hPreviousDbEvent, 0);

+		while (hExistingDbEvent != NULL)

+		{

+			ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

+			dbeiExisting.cbSize = sizeof(dbeiExisting);

+			CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

+

+			if (dbeiExisting.timestamp != dwPreviousTimeStamp)

+			{

+				// use found event

+				hPreviousDbEvent = hExistingDbEvent;

+				dwPreviousTimeStamp = dbeiExisting.timestamp;

+				break;

+			}

+

+			hPreviousDbEvent = hExistingDbEvent;

+			hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT, (WPARAM)hExistingDbEvent, 0);

+		}

+	}

+

+	hExistingDbEvent = hPreviousDbEvent;

+

+	if (dbei.timestamp <= dwPreviousTimeStamp)

+	{

+		// look back

+		while (hExistingDbEvent != NULL)

+		{

+			ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

+			dbeiExisting.cbSize = sizeof(dbeiExisting);

+			CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

+

+			if (dbei.timestamp > dbeiExisting.timestamp)

+			{

+			    // remember event

+				hPreviousDbEvent = hExistingDbEvent;

+				dwPreviousTimeStamp = dbeiExisting.timestamp;

+				return FALSE;

+			}

+

+			// Compare event with import candidate

+			if ((dbei.timestamp == dbeiExisting.timestamp) &&

+				(dbei.eventType == dbeiExisting.eventType) &&

+				(dbei.cbBlob == dbeiExisting.cbBlob) &&

+				((dbei.flags&DBEF_SENT) == (dbeiExisting.flags&DBEF_SENT)))

+			{

+				// remember event

+				hPreviousDbEvent = hExistingDbEvent;

+				dwPreviousTimeStamp = dbeiExisting.timestamp;

+				return TRUE;

+			}

+

+			// Get previous event in chain

+			hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDPREV, (WPARAM)hExistingDbEvent, 0);

+		}

+

+    }

+    else

+    {

+		// look forward

+		while (hExistingDbEvent != NULL)

+		{

+			ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));

+			dbeiExisting.cbSize = sizeof(dbeiExisting);

+			CallService(MS_DB_EVENT_GET, (WPARAM)hExistingDbEvent, (LPARAM)&dbeiExisting);

+

+			if (dbei.timestamp < dbeiExisting.timestamp)

+			{

+			    // remember event

+				hPreviousDbEvent = hExistingDbEvent;

+				dwPreviousTimeStamp = dbeiExisting.timestamp;

+				return FALSE;

+			}

+

+			// Compare event with import candidate

+			if ((dbei.timestamp == dbeiExisting.timestamp) &&

+				(dbei.eventType == dbeiExisting.eventType) &&

+				(dbei.cbBlob == dbeiExisting.cbBlob) &&

+				((dbei.flags&DBEF_SENT) == (dbeiExisting.flags&DBEF_SENT)))

+			{

+				// remember event

+				hPreviousDbEvent = hExistingDbEvent;

+				dwPreviousTimeStamp = dbeiExisting.timestamp;

+				return TRUE;

+			}

+

+			// Get next event in chain

+			hExistingDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT, (WPARAM)hExistingDbEvent, 0);

+		}

+

+	}

+	// reset last event

+	hPreviousContact = INVALID_HANDLE_VALUE;

+	return FALSE;

+}

diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp
index 780501a10a..029f251943 100644
--- a/plugins/Import/src/wizard.cpp
+++ b/plugins/Import/src/wizard.cpp
@@ -103,7 +103,7 @@ INT_PTR CALLBACK FinishedPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
 		SendMessage(GetParent(hdlg), WIZM_SETCANCELTEXT, 0, (LPARAM)TranslateT("Finish"));

 		CheckDlgButton(hdlg, IDC_DONTLOADPLUGIN, BST_UNCHECKED);

 		return TRUE;

-		

+

 	case WM_COMMAND:

 		switch( LOWORD( wParam )) {

 		case IDOK:

@@ -114,7 +114,7 @@ INT_PTR CALLBACK FinishedPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
 			if ( IsDlgButtonChecked( hdlg, IDC_DONTLOADPLUGIN )) {			

 				char sModuleFileName[MAX_PATH];

 				char *pszFileName;

-				

+

 				GetModuleFileNameA(hInst, sModuleFileName, sizeof(sModuleFileName));

 				pszFileName = strrchr(sModuleFileName, '\\' );

 				if (pszFileName == NULL)

@@ -135,7 +135,7 @@ INT_PTR CALLBACK FinishedPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
 		}

 		break;

 	}

-	

+

 	return FALSE;

 }