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/Nudge/src/main.cpp | 5 +---- plugins/Nudge/src/shake.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'plugins/Nudge/src') diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index aacea0f23c..e4eaf555c9 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -10,7 +10,6 @@ CShake shake; CNudge GlobalNudge; CMPlugin g_plugin; -CLIST_INTERFACE *pcli; static IconItem iconList[] = { @@ -86,7 +85,7 @@ static INT_PTR NudgeSend(WPARAM hContact, LPARAM lParam) void OpenContactList() { - HWND hWnd = pcli->hwndContactList; + HWND hWnd = g_CLI.hwndContactList; ShowWindow(hWnd, SW_RESTORE); ShowWindow(hWnd, SW_SHOW); } @@ -476,8 +475,6 @@ static int AccListChanged(WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(void) { - pcli = Clist_GetInterface(); - LoadIcons(); HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); diff --git a/plugins/Nudge/src/shake.cpp b/plugins/Nudge/src/shake.cpp index d66d7ad6be..afcb4181f8 100644 --- a/plugins/Nudge/src/shake.cpp +++ b/plugins/Nudge/src/shake.cpp @@ -31,7 +31,7 @@ void __cdecl ShakeClistWindow(void *Param) INT_PTR ShakeClist(WPARAM, LPARAM) { - mir_forkthread(ShakeClistWindow, (void*)pcli->hwndContactList); + mir_forkthread(ShakeClistWindow, (void*)g_CLI.hwndContactList); return 0; } -- cgit v1.2.3