diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-09 18:45:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-09 18:45:05 +0000 |
| commit | abb55ccf0e13f077d976777c6e16b9a7bc889821 (patch) | |
| tree | 339c2e2a86269cea895a2fe8b47ff4c64bd7f387 /protocols/MRA/src/Mra_functions.cpp | |
| parent | 27ddbbb6b035d236996e52624333229e1f0b882a (diff) | |
- deleted groups aren't processed;
- group renaming added;
- version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@6036 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/Mra_functions.cpp')
| -rw-r--r-- | protocols/MRA/src/Mra_functions.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index d745d942f7..6550e5b915 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -307,6 +307,7 @@ DWORD CMraProto::MraMoveContactToGroup(HANDLE hContact, DWORD dwGroupID, LPCTSTR break;
}
+ DWORD dwContactFlags = CONTACT_FLAG_UNICODE_NAME | CONTACT_FLAG_GROUP;
if (p == NULL) {
if (m_groups.getCount() == 20)
return 0;
@@ -316,15 +317,16 @@ DWORD CMraProto::MraMoveContactToGroup(HANDLE hContact, DWORD dwGroupID, LPCTSTR if (m_groups.find((MraGroupItem*)&id) == NULL)
break;
- DWORD dwContactFlags = (CONTACT_FLAG_UNICODE_NAME | CONTACT_FLAG_GROUP) + (id << 24);
+ dwContactFlags |= (id << 24);
p = new MraGroupItem(id, dwContactFlags, ptszName);
m_groups.insert(p);
MraAddContact(NULL, dwContactFlags, 0, ptszName, p->m_name);
}
+ else dwContactFlags |= (p->m_id << 24);
if (dwGroupID != p->m_id) {
setDword("GroupID", p->m_id);
- MraModifyContact(hContact, 0, 0, &p->m_id);
+ MraModifyContact(hContact, 0, &dwContactFlags, &p->m_id);
}
return p->m_id;
}
|