diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-03 20:16:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-03 20:16:16 +0000 |
| commit | bcce699a176c52da83e7bb6fb588038df9af926a (patch) | |
| tree | 932adef207f5356f200a605b7c05871a2674a744 /plugins | |
| parent | fa77eb5fb680319c976fc6209842dc1796d6e967 (diff) | |
"MetaContacts Hidden Group" removed forever
git-svn-id: http://svn.miranda-ng.org/main/trunk@8389 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clistsettings.cpp | 5 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clc.cpp | 5 | ||||
| -rw-r--r-- | plugins/Db3x_mmap/src/dbcontacts.cpp | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index 8eea4be0ea..010b3d5d5a 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -441,9 +441,8 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) if (!strcmp(cws->szModule, pdnce->m_cache_cszProto)) {
InvalidateDNCEbyPointer(hContact, pdnce, cws->value.type);
- // !!!!!!!!!!!!!!!!!!!!!!!
- // if (!strcmp(cws->szSetting,"IsSubcontact"))
- // PostMessage(pcli->hwndContactTree,CLM_AUTOREBUILD, 0, 0);
+ if (!strcmp(cws->szSetting, "IsSubcontact"))
+ PostMessage(pcli->hwndContactTree, CLM_AUTOREBUILD, 0, 0);
if (!mir_strcmp(cws->szSetting, "Status") || wildcmp(cws->szSetting, "Status?")) {
if (!mir_strcmp(cws->szModule, META_PROTO) && mir_strcmp(cws->szSetting, "Status")) {
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 3fe336762a..2b19c96016 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -155,9 +155,8 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam) if ((lstrlenA(cws->szSetting) > 6 && !strncmp(cws->szSetting, "Status", 6)) || strstr("Default,ForceSend,Nick", cws->szSetting))
pcli->pfnClcBroadcast(INTM_NAMEORDERCHANGED, hContact, lParam);
}
- // !!!!!!!!!!!!!!!!!!
- // if (cfg::dat.bMetaAvail && cfg::dat.bMetaEnabled && !__strcmp(cws->szModule, cfg::dat.szMetaName) && !__strcmp(cws->szSetting, "IsSubcontact"))
- // pcli->pfnClcBroadcast(INTM_HIDDENCHANGED, hContact, lParam);
+ if (cfg::dat.bMetaEnabled && !__strcmp(cws->szModule, META_PROTO) && !__strcmp(cws->szSetting, "IsSubcontact"))
+ pcli->pfnClcBroadcast(INTM_HIDDENCHANGED, hContact, lParam);
}
}
else if (!__strcmp(cws->szModule, META_PROTO)) {
diff --git a/plugins/Db3x_mmap/src/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp index d05dac5555..0f3027afb4 100644 --- a/plugins/Db3x_mmap/src/dbcontacts.cpp +++ b/plugins/Db3x_mmap/src/dbcontacts.cpp @@ -263,7 +263,7 @@ void CDb3Mmap::FillContacts() DBCachedContact *cc = m_cache->AddContactToCache(dwContactID);
cc->dwDriverData = dwOffset;
CheckProto(cc, "");
-
+
DBVARIANT dbv; dbv.type = DBVT_DWORD;
cc->nSubs = (0 != GetContactSetting(dwContactID, META_PROTO, "NumContacts", &dbv)) ? -1 : dbv.dVal;
if (cc->nSubs != -1) {
@@ -286,7 +286,7 @@ void CDb3Mmap::FillContacts() }
cc->nDefault = (0 != GetContactSetting(dwContactID, META_PROTO, "Default", &dbv)) ? -1 : dbv.dVal;
cc->parentID = (0 != GetContactSetting(dwContactID, META_PROTO, "ParentMeta", &dbv)) ? NULL : dbv.dVal;
-
+
// whether we need conversion or not
if (!GetContactSetting(dwContactID, META_PROTO, "MetaID", &dbv))
arMetas.insert((void*)dwContactID);
@@ -312,7 +312,6 @@ void CDb3Mmap::FillContacts() // wipe out old data from subcontacts
DeleteContactSetting(cc->pSubs[k], META_PROTO, "ContactNumber");
- DeleteContactSetting(cc->pSubs[k], META_PROTO, "IsSubcontact");
DeleteContactSetting(cc->pSubs[k], META_PROTO, "MetaLink");
}
}
|