From c48ee58a97b7d9548f94071fa9aa7d152e253cd6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 6 Apr 2016 19:39:44 +0000 Subject: let's separate flies from cutlets, finally git-svn-id: http://svn.miranda-ng.org/main/trunk@16599 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clistsettings.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index 70e2a40fce..765aa4df11 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -307,18 +307,8 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; if (!strcmp(cws->szModule, pdnce->m_pszProto)) { - if (!strcmp(cws->szSetting, "Status") || wildcmp(cws->szSetting, "Status?")) { + if (!strcmp(cws->szSetting, "Status")) { pdnce->m_iStatus = cws->value.wVal; - if (!strcmp(cws->szModule, META_PROTO) && strcmp(cws->szSetting, "Status")) { - if (pcli->hwndContactTree && g_flag_bOnModulesLoadedCalled) - pcli->pfnInitAutoRebuild(pcli->hwndContactTree); - - if ((db_get_w(NULL, "CList", "SecondLineType", SETTING_SECONDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE || db_get_w(NULL, "CList", "ThirdLineType", SETTING_THIRDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->m_pszProto) - amRequestAwayMsg(hContact); - - return 0; - } - if (pdnce->bIsHidden) return 0; @@ -332,6 +322,13 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) pcli->pfnClcBroadcast(INTM_STATUSCHANGED, hContact, 0); cli_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(cws->szModule, cws->value.wVal, hContact), 0); //by FYR } + else if (!strcmp(cws->szModule, META_PROTO) && !memcmp(cws->szSetting, "Status", 6)) { // Status0..N for metacontacts + if (pcli->hwndContactTree && g_flag_bOnModulesLoadedCalled) + pcli->pfnInitAutoRebuild(pcli->hwndContactTree); + + if ((db_get_w(NULL, "CList", "SecondLineType", SETTING_SECONDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE || db_get_w(NULL, "CList", "ThirdLineType", SETTING_THIRDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->m_pszProto) + amRequestAwayMsg(hContact); + } else if (!strcmp(cws->szSetting, "ApparentMode")) pdnce->ApparentMode = cws->value.wVal; else if (!strcmp(cws->szSetting, "IdleTS")) -- cgit v1.2.3