From 176e52e14fd0358a7f26ca8d7b0205244dfde2e7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 23 May 2018 23:29:25 +0300 Subject: no need to initialize pcli variable in each plugin (only in Clist_*) --- plugins/StatusManager/src/StartupStatus/startupstatus.cpp | 8 ++++---- plugins/StatusManager/src/main.cpp | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'plugins/StatusManager/src') diff --git a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp index a4e67e1b31..7f4463a93e 100644 --- a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp +++ b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp @@ -268,13 +268,13 @@ static int OnShutdown(WPARAM, LPARAM) // set windowstate and docked for next startup if (db_get_b(0, SSMODULENAME, SETTING_SETWINSTATE, 0)) { int state = db_get_b(0, SSMODULENAME, SETTING_WINSTATE, SETTING_STATE_NORMAL); - HWND hClist = pcli->hwndContactList; + HWND hClist = g_CLI.hwndContactList; BOOL isHidden = !IsWindowVisible(hClist); switch (state) { case SETTING_STATE_HIDDEN: // try to use services where possible if (!isHidden) - pcli->pfnShowHide(); + g_CLI.pfnShowHide(); break; case SETTING_STATE_MINIMIZED: @@ -285,7 +285,7 @@ static int OnShutdown(WPARAM, LPARAM) case SETTING_STATE_NORMAL: // try to use services where possible (that's what they're for) if (isHidden) - pcli->pfnShowHide(); + g_CLI.pfnShowHide(); break; } } @@ -366,7 +366,7 @@ int SSModuleLoaded(WPARAM, LPARAM) // win size and location if (db_get_b(0, SSMODULENAME, SETTING_SETWINLOCATION, 0) || db_get_b(0, SSMODULENAME, SETTING_SETWINSIZE, 0)) { - HWND hClist = pcli->hwndContactList; + HWND hClist = g_CLI.hwndContactList; // store in db if (db_get_b(0, SSMODULENAME, SETTING_SETWINLOCATION, 0)) { diff --git a/plugins/StatusManager/src/main.cpp b/plugins/StatusManager/src/main.cpp index d5f1aa39a5..7bf1f1f69a 100644 --- a/plugins/StatusManager/src/main.cpp +++ b/plugins/StatusManager/src/main.cpp @@ -20,7 +20,6 @@ #include "stdafx.h" CMPlugin g_plugin; -CLIST_INTERFACE *pcli; ///////////////////////////////////////////////////////////////////////////////////////// // returns plugin's extended information @@ -95,8 +94,6 @@ int OnAccChanged(WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(void) { - pcli = Clist_GetInterface(); - HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); HookEvent(ME_PROTO_ACCLISTCHANGED, OnAccChanged); -- cgit v1.2.3