From 419d2a2454ee7d3eb7b394547351509ac801c8f6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 2 Mar 2014 20:06:53 +0000 Subject: MS_MC_DISABLEHIDDENGROUP - nasty clutch removed git-svn-id: http://svn.miranda-ng.org/main/trunk@8363 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/contact.cpp | 16 ++-------------- plugins/Clist_nicer/src/init.cpp | 2 -- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'plugins/Clist_nicer') diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp index 5272152279..e3a7f4ca47 100644 --- a/plugins/Clist_nicer/src/contact.cpp +++ b/plugins/Clist_nicer/src/contact.cpp @@ -122,14 +122,11 @@ void MF_UpdateThread(LPVOID) CloseHandle(hEvent); } -static BOOL mc_hgh_removed = FALSE; - void LoadContactTree(void) { int i, status, hideOffline; - BOOL mc_disablehgh = ServiceExists(MS_MC_DISABLEHIDDENGROUP); - DBVARIANT dbv = {0}; - BYTE bMsgFrequency = cfg::getByte("CList", "fhistdata", 0); + BYTE bMsgFrequency = cfg::getByte("CList", "fhistdata", 0); + DBVARIANT dbv = { 0 }; CallService(MS_CLUI_LISTBEGINREBUILD, 0, 0); for (i = 1; ; i++) { @@ -145,20 +142,11 @@ void LoadContactTree(void) if ((!hideOffline || status != ID_STATUS_OFFLINE) && !CLVM_GetContactHiddenStatus(hContact, NULL, NULL)) pcli->pfnChangeContactIcon(hContact, IconFromStatusMode(GetContactProto(hContact), status, hContact, NULL), 1); - if (mc_disablehgh && !mc_hgh_removed) { - if ( !db_get(hContact, "CList", "Group", &dbv)) { - if ( !strcmp(dbv.pszVal, "MetaContacts Hidden Group")) - db_unset(hContact, "CList", "Group"); - mir_free(dbv.pszVal); - } - } - // build initial data for message frequency if ( !bMsgFrequency) MF_CalcFrequency(hContact, 100, 0); } cfg::writeByte("CList", "fhistdata", 1); - mc_hgh_removed = TRUE; CallService(MS_CLUI_LISTENDREBUILD, 0, 0); } diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index 73c7381fa6..2188683315 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -174,8 +174,6 @@ static int systemModulesLoaded(WPARAM wParam, LPARAM lParam) GetSystemTime(&cfg::dat.st); SystemTimeToFileTime(&cfg::dat.st, &cfg::dat.ft); - if (ServiceExists(MS_MC_DISABLEHIDDENGROUP)) - CallService(MS_MC_DISABLEHIDDENGROUP, 1, 0); cfg::dat.bMetaEnabled = cfg::getByte(META_PROTO, "Enabled", 1); cfg::dat.bAvatarServiceAvail = ServiceExists(MS_AV_GETAVATARBITMAP) ? TRUE : FALSE; -- cgit v1.2.3