From 5e0f2f99192c6cc28e077800371bc0e25fb246de Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 30 Aug 2018 12:24:33 +0300 Subject: minor code cleaning --- include/delphi/m_clist.inc | 18 ------------------ plugins/Clist_modern/src/modern_clisttray.cpp | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc index e71cc3e622..5a3f10c88a 100644 --- a/include/delphi/m_clist.inc +++ b/include/delphi/m_clist.inc @@ -8,24 +8,6 @@ type HGENMENU = THANDLE; -const - { - wParam : new_status - lParam : 0 - Affect : Sent when the user acks to change their status, see notes - Notes : Also sent due to a MS_CLIST_SETSTATUSMODE - } - ME_CLIST_STATUSMODECHANGE:PAnsiChar = 'CList/StatusModeChange'; - - { - wParam : 0 - lParam : 0 - Affect : Get the current status mode, see notes - Notes : This is the status, as set by the user, not any protocol specific status - all protocol modules will attempt to conform to this setting at ALL times. - } - MS_CLIST_GETSTATUSMODE:PAnsiChar = 'CList/GetStatusMode'; - function Clist_SetStatusMode(status:int) : int; stdcall; external AppDll; function Menu_BuildContactMenu(hContact:TMCONTACT) : HMENU; stdcall; external AppDll; diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index e236e53743..071c807f36 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -80,7 +80,7 @@ INT_PTR CListTray_GetGlobalStatus(WPARAM, LPARAM) { g_szConnectingProto = nullptr; - int curstatus = 0; + int curstatus = ID_STATUS_OFFLINE; int connectingCount = 0; g_bMultiConnectionMode = false; @@ -99,7 +99,7 @@ INT_PTR CListTray_GetGlobalStatus(WPARAM, LPARAM) curstatus = it->iRealStatus; } - return curstatus ? curstatus : ID_STATUS_OFFLINE; + return curstatus; } ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3