merged with miranda_ng main repo

"boosted" process management
evnt_to_db/history>actual_sending logic to avoid srmm problem

1 files changed, 4 insertions, 2 deletions

diff --git a/init.cpp b/init.cpp
index 2840ecf..6af1bfc 100755
--- a/init.cpp
+++ b/init.cpp
@@ -266,7 +266,8 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 	CreateProtoServiceFunction(szGPGModuleName, PSS_MESSAGE"W", (MIRANDASERVICE)SendMsgSvc);

 

 	CreateProtoServiceFunction(szGPGModuleName, PSS_FILE, (MIRANDASERVICE)onSendFile);

-	CreateProtoServiceFunction(szGPGModuleName, PSS_FILE"W", (MIRANDASERVICE)onSendFile);

+	CreateProtoServiceFunction(szGPGModuleName, PSS_FILE"W", (MIRANDASERVICE)onSendFile);
+	clean_temp_dir();

 

 	for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))

 		if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)szGPGModuleName))

@@ -287,7 +288,7 @@ extern "C" int __declspec(dllexport) Unload(void)
 	{

 		for(list<wstring>::iterator p = transfers.begin(); p != transfers.end(); p++)

 			if(!(*p).empty())

-				DeleteFile((*p).c_str());

+				boost::filesystem::remove((*p));

 	}

 	mir_free(inopentag);

 	mir_free(inclosetag);

@@ -295,5 +296,6 @@ extern "C" int __declspec(dllexport) Unload(void)
 	mir_free(outclosetag);

 	if(password)

 		mir_free(password);

+	clean_temp_dir();

 	return 0;

 }