From a8e8aebfd4f53977873c72c2d828c2c1f505f10d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Feb 2014 21:06:38 +0000 Subject: clist_modern: metacontacts are always enabled git-svn-id: http://svn.miranda-ng.org/main/trunk@8318 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/hdr/modern_global_structure.h | 1 - plugins/Clist_modern/src/modern_clcitems.cpp | 2 +- plugins/Clist_modern/src/modern_clui.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'plugins') 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)) -- cgit v1.2.3