Jabber:

- useless parameter in CJabberProto::OnAddContactForever removed;
- when we receive subscription = remove we just change it to SUB_NONE instead of removing contact from LIST_ROSTER;
- code cleaning

1 files changed, 5 insertions, 6 deletions

diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index a05355f973..ec31312ec5 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -125,11 +125,8 @@ void __cdecl CJabberProto::OnRenameContact(DBCONTACTWRITESETTING *cws, MCONTACT
 	}

 }

 

-void __cdecl CJabberProto::OnAddContactForever(DBCONTACTWRITESETTING *cws, MCONTACT hContact)

+void __cdecl CJabberProto::OnAddContactForever(MCONTACT hContact)

 {

-	if (cws->value.type != DBVT_DELETED && !(cws->value.type == DBVT_BYTE && cws->value.bVal == 0))

-		return;

-

 	ptrW jid(getWStringA(hContact, "jid"));

 	if (jid == nullptr)

 		return;

@@ -169,8 +166,10 @@ int __cdecl CJabberProto::OnDbSettingChanged(WPARAM hContact, LPARAM lParam)
 		OnRenameGroup(cws, hContact);

 	else if (!strcmp(cws->szSetting, "MyHandle"))

 		OnRenameContact(cws, hContact);

-	else if (!strcmp(cws->szSetting, "NotOnList"))

-		OnAddContactForever(cws, hContact);

+	else if (!strcmp(cws->szSetting, "NotOnList")) {

+		if (cws->value.type == DBVT_DELETED || (cws->value.type == DBVT_BYTE && cws->value.bVal == 0))

+			OnAddContactForever(hContact);

+	}

 

 	return 0;

 }