diff options
| -rw-r--r-- | plugins/Clist_modern/src/hdr/modern_global_structure.h | 1 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcitems.cpp | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clui.cpp | 1 | ||||
| -rw-r--r-- | src/mir_core/db.cpp | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/plugins/Clist_modern/src/hdr/modern_global_structure.h b/plugins/Clist_modern/src/hdr/modern_global_structure.h index 10b238cbfa..2f6b095114 100644 --- a/plugins/Clist_modern/src/hdr/modern_global_structure.h +++ b/plugins/Clist_modern/src/hdr/modern_global_structure.h @@ -32,7 +32,6 @@ typedef struct tagCLUIDATA DWORD stickyMaskFilter;
DWORD filterFlags;
DWORD bFilterEffective;
- BOOL bMetaAvail;
DWORD t_now;
// Modern Global Variables
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 8c3e0e8845..240aa9c7f8 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -698,7 +698,7 @@ int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, Clc BOOL fEmbedded = dat->force_in_dialog;
// always hide subcontacts (but show them on embedded contact lists)
- if (g_CluiData.bMetaAvail && dat != NULL && dat->IsMetaContactsEnabled && db_mc_isSub(hContact))
+ if (dat != NULL && dat->IsMetaContactsEnabled && db_mc_isSub(hContact))
return -1; //subcontact
if (pdnce && pdnce->isUnknown && !fEmbedded)
return 1; //'Unknown Contact'
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 0b4813f8e7..9e677a612e 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -146,7 +146,6 @@ void CLUI::cliOnCreateClc(void) int CLUI::OnEvent_ModulesLoaded(WPARAM wParam, LPARAM lParam)
{
- g_CluiData.bMetaAvail = ServiceExists(MS_MC_GETDEFAULTCONTACT) ? TRUE : FALSE;
setlocale(LC_ALL, ""); //fix for case insensitive comparing
if ( ServiceExists(MS_MC_DISABLEHIDDENGROUP))
diff --git a/src/mir_core/db.cpp b/src/mir_core/db.cpp index dafa2b2d93..b851a6a96c 100644 --- a/src/mir_core/db.cpp +++ b/src/mir_core/db.cpp @@ -336,7 +336,7 @@ MIR_CORE_DLL(int) db_mc_isSub(MCONTACT hContact) if (currDb == NULL) return false;
DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact);
- return (cc == NULL) ? false : cc->parentID != INVALID_CONTACT_ID;
+ return (cc == NULL) ? false : cc->parentID != 0;
}
MIR_CORE_DLL(MCONTACT) db_mc_getMeta(MCONTACT hSubContact)
|