summaryrefslogtreecommitdiff
path: root/protocols/MRA/src/MraProto.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-09-09 16:56:30 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-09-09 16:56:30 +0000
commit7963b60b9f1bcd478f537f57abde51204c97eb90 (patch)
treed0e892316468ea91d4a87f9ea815ce7224737397 /protocols/MRA/src/MraProto.cpp
parentf6233a8261525da7c1a7ee52afd46d1980275a40 (diff)
- fixed regression with passive contact addition;
- fixed "Bad date sent" git-svn-id: http://svn.miranda-ng.org/main/trunk@6032 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/MraProto.cpp')
-rw-r--r--protocols/MRA/src/MraProto.cpp20
1 files changed, 3 insertions, 17 deletions
diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index b2252970ac..9e1a5b104c 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -163,25 +163,11 @@ HANDLE CMraProto::AddToListByEmail(LPCTSTR plpsEMail, LPCTSTR plpsNick, LPCTSTR
if (dwFlags & PALF_TEMPORARY)
db_set_b(hContact, "CList", "Hidden", 1);
- else {
- db_unset(hContact, "CList", "Hidden");
+ else
db_unset(hContact, "CList", "NotOnList");
- }
-
- if (bAdded) {
- CMStringW wszAuthMessage;
- if ( !mraGetStringW(NULL, "AuthMessage", wszAuthMessage))
- wszAuthMessage = TranslateW(MRA_DEFAULT_AUTH_MESSAGE);
-
- CMStringA szEmail;
- CMStringW wszNick;
- DWORD dwContactFlag;
- GetContactBasicInfoW(hContact, NULL, NULL, &dwContactFlag, NULL, NULL, &szEmail, &wszNick, NULL);
- MraAddContact(hContact, dwContactFlag, 0, szEmail, wszNick, NULL, &wszAuthMessage);
-
- MraUpdateContactInfo(hContact); // request info update
- }
+ if (bAdded)
+ MraUpdateContactInfo(hContact);
return hContact;
}