fixes #4104 (Удаление серверной истории)

41 files changed, 43 insertions, 43 deletions

diff --git a/protocols/CurrencyRates/src/CurrencyRatesProviderBase.cpp b/protocols/CurrencyRates/src/CurrencyRatesProviderBase.cpp
index 989ae7bd37..f4558d2d17 100644
--- a/protocols/CurrencyRates/src/CurrencyRatesProviderBase.cpp
+++ b/protocols/CurrencyRates/src/CurrencyRatesProviderBase.cpp
@@ -912,7 +912,7 @@ bool CCurrencyRatesProviderBase::WatchForRate(const TRateInfo &ri, bool bWatch)
 		}
 	}
 	else if (!bWatch && hContact) {
-		db_delete_contact(hContact, true);
+		db_delete_contact(hContact, CDF_FROM_SERVER);
 		return true;
 	}
 
diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index 48b496db7d..e2f0658819 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -626,7 +626,7 @@ int CDiscordProto::OnAccountChanged(WPARAM iAction, LPARAM lParam)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-bool CDiscordProto::OnContactDeleted(MCONTACT hContact)

+bool CDiscordProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	CDiscordUser *pUser = FindUser(getId(hContact, DB_KEY_ID));

 	if (pUser == nullptr || !m_bOnline)

diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index bb99d2efbc..1bc7c04444 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -444,7 +444,7 @@ public:
 	int      SetStatus(int iNewStatus) override;

 

 	void     OnBuildProtoMenu() override;

-	bool     OnContactDeleted(MCONTACT) override;

+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnMarkRead(MCONTACT, MEVENT) override;

 	void     OnModulesLoaded() override;

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 3e39833635..e7ed33b01b 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1193,7 +1193,7 @@ void GaduProto::broadcastnewstatus(int newStatus)
 ////////////////////////////////////////////////////////////

 // When contact is deleted

 

-bool GaduProto::OnContactDeleted(MCONTACT hContact)

+bool GaduProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	uin_t uin = (uin_t)getDword(hContact, GG_KEY_UIN);

 

diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h
index f7387f789c..c02dc9a0cb 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.h
+++ b/protocols/Gadu-Gadu/src/gg_proto.h
@@ -56,7 +56,7 @@ struct GaduProto : public PROTO<GaduProto>
 	int      UserIsTyping(MCONTACT hContact, int type) override;

 				

 	void     OnBuildProtoMenu(void) override;

-	bool     OnContactDeleted(MCONTACT) override;

+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index cb2ca4684a..08a18cbe1e 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -126,7 +126,7 @@ int GaduProto::gc_event(WPARAM, LPARAM lParam)
 		list_remove(&chats, chat, 1);

 

 		// Remove contact from contact list (duh!) should be done by chat.dll !!

-		db_delete_contact(gch->si->hContact, true);

+		db_delete_contact(gch->si->hContact, CDF_FROM_SERVER);

 		return 1;

 	}

 

diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp
index 392e9b0d66..b5e9ae144f 100644
--- a/protocols/Gadu-Gadu/src/services.cpp
+++ b/protocols/Gadu-Gadu/src/services.cpp
@@ -376,7 +376,7 @@ INT_PTR GaduProto::getmyawaymsg(WPARAM wParam, LPARAM lParam)
 INT_PTR GaduProto::leavechat(WPARAM hContact, LPARAM)

 {

 	if (hContact)

-		db_delete_contact(hContact, true);

+		db_delete_contact(hContact, CDF_FROM_SERVER);

 

 	return 0;

 }

diff --git a/protocols/GmailNotifier/src/options.cpp b/protocols/GmailNotifier/src/options.cpp
index 14d44e609e..4283f646f6 100644
--- a/protocols/GmailNotifier/src/options.cpp
+++ b/protocols/GmailNotifier/src/options.cpp
@@ -202,7 +202,7 @@ public:
 
 		Account &acc = g_accs[curIndex];
 		DeleteResults(acc.results.next);
-		db_delete_contact(acc.hContact, true);
+		db_delete_contact(acc.hContact, CDF_FROM_SERVER);
 		g_accs.remove(curIndex);
 
 		m_combo.SetCurSel(curIndex = 0);
diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index de01c7ebfa..e4048a7211 100644
--- a/protocols/ICQ-WIM/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
@@ -157,7 +157,7 @@ void CIcqProto::OnContactAdded(MCONTACT hContact)
 	}

 }

 

-bool CIcqProto::OnContactDeleted(MCONTACT hContact)

+bool CIcqProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	CMStringW szId(GetUserId(hContact));

 	if (!isChatRoom(hContact)) {

diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h
index 027747b562..d5d1720d85 100644
--- a/protocols/ICQ-WIM/src/proto.h
+++ b/protocols/ICQ-WIM/src/proto.h
@@ -441,7 +441,7 @@ class CIcqProto : public PROTO<CIcqProto>
 			    

 	void      OnBuildProtoMenu(void) override;

 	void      OnContactAdded(MCONTACT) override;

-	bool      OnContactDeleted(MCONTACT) override;

+	bool      OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow   OnCreateAccMgrUI(MWindow) override;

 	void      OnEventDeleted(MCONTACT, MEVENT) override;

 	void      OnEventEdited(MCONTACT, MEVENT, const DBEVENTINFO &dbei) override;

diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp
index b67df41639..ae12f8de57 100644
--- a/protocols/ICQ-WIM/src/server.cpp
+++ b/protocols/ICQ-WIM/src/server.cpp
@@ -335,7 +335,7 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact, boo
 			pUser->m_bInList = true;

 	}

 	else if (bIgnored) {

-		db_delete_contact(hContact, true);

+		db_delete_contact(hContact, CDF_FROM_SERVER);

 		return INVALID_CONTACT_ID;

 	}

 

diff --git a/protocols/IRCG/src/ircproto.h b/protocols/IRCG/src/ircproto.h
index bcaad1cf56..eaec1fd525 100644
--- a/protocols/IRCG/src/ircproto.h
+++ b/protocols/IRCG/src/ircproto.h
@@ -70,7 +70,7 @@ struct CIrcProto : public PROTO<CIrcProto>
 	int      SetAwayMsg(int m_iStatus, const wchar_t *msg) override;
 			   
 	void     OnBuildProtoMenu(void) override;
-	bool     OnContactDeleted(MCONTACT) override;
+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;
 	MWindow  OnCreateAccMgrUI(MWindow) override;
 	void     OnModulesLoaded() override;
 	void     OnShutdown() override;
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 9d2d5a8cb2..2fccbe141d 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -165,7 +165,7 @@ INT_PTR __cdecl CIrcProto::OnDoubleclicked(WPARAM, LPARAM lParam)
 	return 0;

 }

 

-bool CIrcProto::OnContactDeleted(MCONTACT hContact)

+bool CIrcProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	if (!hContact)

 		return false;

diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp
index 15969c1b41..f32a001092 100644
--- a/protocols/IRCG/src/tools.cpp
+++ b/protocols/IRCG/src/tools.cpp
@@ -26,7 +26,7 @@ void CIrcProto::CheckUpdate()
 	if (getByte("Compatibility") < 1) {

 		for (auto &cc : AccContacts()) {

 			if (getByte(cc, "ChatRoom") == GCW_SERVER)

-				db_delete_contact(cc, true);

+				db_delete_contact(cc, CDF_FROM_SERVER);

 			else {

 				ptrA szNick(getUStringA(cc, "Nick"));

 				if (szNick)

diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 6f5aec66ac..cf3c2f92a7 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /////////////////////////////////////////////////////////////////////////////////////////

 // OnContactDeleted - processes a contact deletion

 

-bool CJabberProto::OnContactDeleted(MCONTACT hContact)

+bool CJabberProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	if (!m_bJabberOnline)	// should never happen

 		return false;

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index fb350691f8..f2d6d3b8a9 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -513,7 +513,7 @@ void CJabberProto::OnIqResultGetRoster(const TiXmlElement *iqNode, CJabberIqInfo
 			auto *item = ListGetItemPtrFromIndex(i);

 			if (item && item->hContact && !item->bRealContact) {

 				debugLogA("Syncing roster: preparing to delete %s (hContact=0x%x)", item->jid, item->hContact);

-				db_delete_contact(item->hContact, true);

+				db_delete_contact(item->hContact, CDF_FROM_SERVER);

 			}

 		}

 	}

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index 920e1a4e29..74265aca85 100644
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -149,7 +149,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	int      UserIsTyping(MCONTACT hContact, int type) override;

 

 	void     OnBuildProtoMenu(void) override;

-	bool     OnContactDeleted(MCONTACT) override;

+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnMarkRead(MCONTACT, MEVENT) override;

 	void     OnModulesLoaded() override;

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 92f490d104..27fe3246a9 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -1370,7 +1370,7 @@ void CJabberProto::OnProcessMessage(const TiXmlElement *node, ThreadData *info)
 					else if (!mir_strcmp(action, "delete")) {

 						MCONTACT cc = HContactFromJID(jid);

 						if (cc)

-							db_delete_contact(cc, true);

+							db_delete_contact(cc, CDF_FROM_SERVER);

 					}

 				}

 			}

diff --git a/protocols/MinecraftDynmap/src/proto.cpp b/protocols/MinecraftDynmap/src/proto.cpp
index 808cd87fe2..d0488ec451 100644
--- a/protocols/MinecraftDynmap/src/proto.cpp
+++ b/protocols/MinecraftDynmap/src/proto.cpp
@@ -141,7 +141,7 @@ void MinecraftDynmapProto::OnShutdown()
 	SetStatus(ID_STATUS_OFFLINE);

 }

 

-bool MinecraftDynmapProto::OnContactDeleted(MCONTACT)

+bool MinecraftDynmapProto::OnContactDeleted(MCONTACT, uint32_t)

 {

 	OnLeaveChat(NULL, NULL);

 	return true;

diff --git a/protocols/MinecraftDynmap/src/proto.h b/protocols/MinecraftDynmap/src/proto.h
index ba00677bc8..5c3f5e0ce1 100644
--- a/protocols/MinecraftDynmap/src/proto.h
+++ b/protocols/MinecraftDynmap/src/proto.h
@@ -46,7 +46,7 @@ public:
 	INT_PTR GetCaps(int type, MCONTACT hContact = NULL) override;

 	int     SetStatus(int iNewStatus) override;

 

-	bool    OnContactDeleted(MCONTACT) override;

+	bool    OnContactDeleted(MCONTACT, uint32_t) override;

 	MWindow OnCreateAccMgrUI(MWindow) override;

 	void    OnShutdown() override;

 

diff --git a/protocols/NewsAggregator/Src/Options.cpp b/protocols/NewsAggregator/Src/Options.cpp
index 4caf6ce6eb..856ac9fe02 100644
--- a/protocols/NewsAggregator/Src/Options.cpp
+++ b/protocols/NewsAggregator/Src/Options.cpp
@@ -127,7 +127,7 @@ public:
 				if (mir_wstrcmp(dbURL, url))
 					continue;
 
-				db_delete_contact(hContact, true);
+				db_delete_contact(hContact, CDF_FROM_SERVER);
 				m_feeds.DeleteItem(isel);
 				break;
 			}
diff --git a/protocols/Non-IM Contact/src/dialog.cpp b/protocols/Non-IM Contact/src/dialog.cpp
index ab1d7e4dcd..3f76b3ae5b 100644
--- a/protocols/Non-IM Contact/src/dialog.cpp
+++ b/protocols/Non-IM Contact/src/dialog.cpp
@@ -290,7 +290,7 @@ INT_PTR addContact(WPARAM, LPARAM)
 	g_plugin.setWString(hContact, "Nick", TranslateT("New Non-IM Contact"));
 	DoPropertySheet(hContact);
 	if (db_get_static(hContact, MODNAME, "Name", tmp, _countof(tmp)))
-		db_delete_contact(hContact, true);
+		db_delete_contact(hContact, CDF_FROM_SERVER);
 	replaceAllStrings(hContact);
 	return 0;
 }
@@ -307,7 +307,7 @@ INT_PTR editContact(WPARAM wParam, LPARAM)
 	}
 	DoPropertySheet(hContact);
 	if (db_get_static(hContact, MODNAME, "Name", tmp, _countof(tmp)))
-		db_delete_contact(hContact, true);
+		db_delete_contact(hContact, CDF_FROM_SERVER);
 	replaceAllStrings(hContact);
 	return 0;
 }
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index bb247ccdaa..27fa124bb6 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -128,7 +128,7 @@ void CSametimeProto::OnShutdown()
 		LogOut();

 }

 

-bool CSametimeProto::OnContactDeleted(MCONTACT hContact)

+bool CSametimeProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	ContactDeleted(hContact);

 	ChatDeleted(hContact);

@@ -141,7 +141,7 @@ void CSametimeProto::SetAllOffline()
 

 	for (auto &hContact : AccContacts()) {

 		if (Contact::IsGroupChat(hContact, m_szModuleName)) {

-			db_delete_contact(hContact, true);

+			db_delete_contact(hContact, CDF_FROM_SERVER);

 			continue;

 		}

 

diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index 159dfa36e8..44f6bcd3a8 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -38,7 +38,7 @@ struct CSametimeProto : public PROTO<CSametimeProto>
 	int      UserIsTyping(MCONTACT hContact, int type) override;

 

 	void     OnShutdown() override;

-	bool     OnContactDeleted(MCONTACT hContact) override;

+	bool     OnContactDeleted(MCONTACT hContact, uint32_t flags) override;

 

 	// sametime.cpp

 	INT_PTR __cdecl GetName(WPARAM wParam, LPARAM lParam);

diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index e569b3a8d4..ddd627f46d 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -233,7 +233,7 @@ INT_PTR CSkypeProto::OnLeaveChatRoom(WPARAM hContact, LPARAM)
 

 		PushRequest(new KickUserRequest(_T2A(idT), m_szSkypename));

 

-		db_delete_contact(hContact, true);

+		db_delete_contact(hContact, CDF_FROM_SERVER);

 	}

 	return 0;

 }

diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp
index ed9225c6d9..52b04369fd 100644
--- a/protocols/SkypeWeb/src/skype_contacts.cpp
+++ b/protocols/SkypeWeb/src/skype_contacts.cpp
@@ -235,7 +235,7 @@ INT_PTR CSkypeProto::OnGrantAuth(WPARAM hContact, LPARAM)
 	return 0;

 }

 

-bool CSkypeProto::OnContactDeleted(MCONTACT hContact)

+bool CSkypeProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	if (IsOnline() && hContact) {

 		if (isChatRoom(hContact))

diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 68ecab3b07..11d91a6aa0 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -68,7 +68,7 @@ public:
 	int      SetAwayMsg(int m_iStatus, const wchar_t *msg) override;

 

 	void     OnBuildProtoMenu(void) override;

-	bool     OnContactDeleted(MCONTACT) override;

+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnMarkRead(MCONTACT, MEVENT) override;

 	void     OnModulesLoaded() override;

diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp
index 5cf5c5908c..f41698b34b 100644
--- a/protocols/Steam/src/steam_proto.cpp
+++ b/protocols/Steam/src/steam_proto.cpp
@@ -332,7 +332,7 @@ HANDLE CSteamProto::GetAwayMsg(MCONTACT hContact)
 	return (HANDLE)1;

 }

 

-bool CSteamProto::OnContactDeleted(MCONTACT hContact)

+bool CSteamProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	// remove only authorized contacts

 	if (!getByte(hContact, "Auth", 0)) {

diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h
index ed7978e890..8cb7fdf0c0 100644
--- a/protocols/Steam/src/steam_proto.h
+++ b/protocols/Steam/src/steam_proto.h
@@ -284,7 +284,7 @@ public:
 

 	int      UserIsTyping(MCONTACT hContact, int type) override;

 

-	bool     OnContactDeleted(MCONTACT) override;

+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnModulesLoaded() override;

 

diff --git a/protocols/Telegram/src/proto.cpp b/protocols/Telegram/src/proto.cpp
index 30b096813b..48bb212951 100644
--- a/protocols/Telegram/src/proto.cpp
+++ b/protocols/Telegram/src/proto.cpp
@@ -116,7 +116,7 @@ void CTelegramProto::OnContactAdded(MCONTACT hContact)
 	}
 }
 
-bool CTelegramProto::OnContactDeleted(MCONTACT hContact)
+bool CTelegramProto::OnContactDeleted(MCONTACT hContact, uint32_t)
 {
 	TD::int53 id = GetId(hContact);
 	if (id == 0)
diff --git a/protocols/Telegram/src/proto.h b/protocols/Telegram/src/proto.h
index a963e17119..62b23d2f8e 100644
--- a/protocols/Telegram/src/proto.h
+++ b/protocols/Telegram/src/proto.h
@@ -367,7 +367,7 @@ public:
 		
 	void     OnBuildProtoMenu() override;
 	void     OnContactAdded(MCONTACT hContact) override;
-	bool     OnContactDeleted(MCONTACT hContact) override;
+	bool     OnContactDeleted(MCONTACT hContact, uint32_t flags) override;
 	MWindow  OnCreateAccMgrUI(MWindow hwndParent) override;
 	void     OnErase() override;
 	void     OnEventDeleted(MCONTACT, MEVENT) override;
diff --git a/protocols/Telegram/src/server.cpp b/protocols/Telegram/src/server.cpp
index 52dc634705..7a59341212 100644
--- a/protocols/Telegram/src/server.cpp
+++ b/protocols/Telegram/src/server.cpp
@@ -548,7 +548,7 @@ void CTelegramProto::ProcessChatLastMessage(TD::updateChatLastMessage *pObj)
 		if (Contact::OnList(pUser->hContact))

 			CallService(MS_HISTORY_EMPTY, pUser->hContact, TRUE);

 		else

-			db_delete_contact(pUser->hContact, true);

+			db_delete_contact(pUser->hContact, CDF_FROM_SERVER);

 	}

 }

 

diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp
index fffe9633ef..db472e3ed0 100644
--- a/protocols/Tox/src/tox_contacts.cpp
+++ b/protocols/Tox/src/tox_contacts.cpp
@@ -201,7 +201,7 @@ INT_PTR CToxProto::OnGrantAuth(WPARAM hContact, LPARAM)
 	return 0;

 }

 

-bool CToxProto::OnContactDeleted(MCONTACT hContact)

+bool CToxProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	if (!IsOnline())

 		return false;

diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 0c9f98f1b2..f5969c8f5e 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -67,7 +67,7 @@ public:
 	int      UserIsTyping(MCONTACT hContact, int type) override;

 

 	void     OnBuildProtoMenu(void) override;

-	bool     OnContactDeleted(MCONTACT) override;

+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnErase() override;

 	void     OnModulesLoaded() override;

diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp
index daf6fd33ca..1f9488e69a 100644
--- a/protocols/Twitter/src/contacts.cpp
+++ b/protocols/Twitter/src/contacts.cpp
@@ -154,7 +154,7 @@ HANDLE CTwitterProto::GetAwayMsg(MCONTACT hContact)
 	return (HANDLE)1;

 }

 

-bool CTwitterProto::OnContactDeleted(MCONTACT hContact)

+bool CTwitterProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	if (m_iStatus != ID_STATUS_ONLINE)

 		return false;

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 60e57f45aa..064497ee3a 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -306,7 +306,7 @@ void CTwitterProto::UpdateSettings()
 		for (MCONTACT hContact = db_find_first(m_szModuleName); hContact;) {

 			MCONTACT hNext = db_find_next(hContact, m_szModuleName);

 			if (isChatRoom(hContact))

-				db_delete_contact(hContact, true);

+				db_delete_contact(hContact, CDF_FROM_SERVER);

 			hContact = hNext;

 		}

 	}

diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h
index 6195e650f2..6a5b0e93bb 100644
--- a/protocols/Twitter/src/proto.h
+++ b/protocols/Twitter/src/proto.h
@@ -183,7 +183,7 @@ public:
 

 	HANDLE   GetAwayMsg(MCONTACT) override;

 

-	bool     OnContactDeleted(MCONTACT) override;

+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnMarkRead(MCONTACT, MEVENT) override;

 	void     OnModulesLoaded() override;

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index e76f8787d9..9af11685b2 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -1868,7 +1868,7 @@ MEVENT CVkProto::GetMessageFromDb(const char *szMessageId, time_t& tTimeStamp, C
 int CVkProto::DeleteContact(MCONTACT hContact)

 {

 	setByte(hContact, "SilentDelete", 1);

-	return db_delete_contact(hContact, true);

+	return db_delete_contact(hContact, CDF_FROM_SERVER);

 }

 

 bool CVkProto::IsMessageExist(VKMessageID_t iMessageId, VKMesType vkType)

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index e974236fb1..8bd1c362c4 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -749,7 +749,7 @@ int CVkProto::GetInfo(MCONTACT hContact, int)
 	return 0;

 }

 

-bool CVkProto::OnContactDeleted(MCONTACT hContact)

+bool CVkProto::OnContactDeleted(MCONTACT hContact, uint32_t)

 {

 	ptrW pwszNick(db_get_wsa(hContact, m_szModuleName, "Nick"));

 	debugLogW(L"CVkProto::OnContactDeleted %s", pwszNick.get());

diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index 8bee1672c3..ecfec1c4eb 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -73,7 +73,7 @@ struct CVkProto : public PROTO<CVkProto>
 	int      UserIsTyping(MCONTACT hContact, int type) override;

 

 	void     OnBuildProtoMenu() override;

-	bool     OnContactDeleted(MCONTACT) override;

+	bool     OnContactDeleted(MCONTACT, uint32_t flags) override;

 	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnMarkRead(MCONTACT, MEVENT) override;

 	void     OnModulesLoaded() override;

diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index b90138c4c2..624376d757 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
@@ -681,7 +681,7 @@ public:
 		DlgSetItemTextW(m_hwnd, IDC_STTIMELEFT, TranslateT("Please wait while no account is in use."));

 

 		if (ActualAccount->hContact != NULL)

-			db_delete_contact(ActualAccount->hContact, true);

+			db_delete_contact(ActualAccount->hContact, CDF_FROM_SERVER);

 

 		DeleteAccount(POP3Plugin, ActualAccount);