diff options
author | Gluzskiy Alexandr <sss123next@list.ru> | 2011-04-13 16:43:43 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss123next@list.ru> | 2011-04-13 16:43:43 +0300 |
commit | 191c2e330ab91f4b35860e08c5424667ed1893c5 (patch) | |
tree | 986158bd87ca65c1a3a722f2593b9d32a1aede56 /icons.cpp | |
parent | f1a201a3c3aeb1ec731d50568eb583a21ed1440c (diff) | |
parent | 3d4fe3639635d0496906fb56b8014b14b0fd1ec7 (diff) |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
messages.cpp
Diffstat (limited to 'icons.cpp')
-rw-r--r-- | icons.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -82,7 +82,9 @@ void setClistIcon(HANDLE hContact) bool enabled = isContactSecured(hContact);
extern HANDLE g_hCLIcon;
HANDLE hMC = hContact;
- if(metaIsProtoMetaContacts(hContact))
+ if(metaIsSubcontact(hContact))
+ hMC = metaGetContact(hContact);
+ else if(metaIsProtoMetaContacts(hContact))
hMC = metaGetContact(hContact);
if(g_hCLIcon && enabled)
{
@@ -107,10 +109,12 @@ void setSrmmIcon(HANDLE hContact) hContact = metaGetMostOnline(hContact);
bool enabled = isContactSecured(hContact);
HANDLE hMC = hContact;
- if(metaIsProtoMetaContacts(hContact))
+ if(metaIsSubcontact(hContact))
+ hMC = metaGetContact(hContact);
+ else if(metaIsProtoMetaContacts(hContact))
hMC = metaGetContact(hContact);
if(ServiceExists(MS_MSG_MODIFYICON))
- { // обновить иконки в srmm
+ {
StatusIconData sid = {0};
sid.cbSize = sizeof(sid);
sid.szModule = szGPGModuleName;
|