From 176e52e14fd0358a7f26ca8d7b0205244dfde2e7 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 23 May 2018 23:29:25 +0300
Subject: no need to initialize pcli variable in each plugin (only in Clist_*)

---
 plugins/Ping/src/ping.cpp       | 3 ---
 plugins/Ping/src/pingthread.cpp | 2 +-
 plugins/Ping/src/utils.cpp      | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'plugins/Ping/src')

diff --git a/plugins/Ping/src/ping.cpp b/plugins/Ping/src/ping.cpp
index 88b3c2b0a4..99cc6b67e3 100644
--- a/plugins/Ping/src/ping.cpp
+++ b/plugins/Ping/src/ping.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 
-CLIST_INTERFACE *pcli;
 CMPlugin g_plugin;
 
 HNETLIBUSER hNetlibUser = nullptr;
@@ -119,8 +118,6 @@ static IconItem iconList[] =
 
 extern "C" __declspec(dllexport) int Load(void)
 {
-	pcli = Clist_GetInterface();
-
 	use_raw_ping = false;
 	db_set_b(0, MODULENAME, "UsingRawSockets", (BYTE)use_raw_ping);
 
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp
index b994f24d1a..0abd6c1025 100644
--- a/plugins/Ping/src/pingthread.cpp
+++ b/plugins/Ping/src/pingthread.cpp
@@ -842,7 +842,7 @@ void AttachToClist(bool attach)
 
 void InitList()
 {
-	hwnd_clist = pcli->hwndContactList;
+	hwnd_clist = g_CLI.hwndContactList;
 
 	WNDCLASS wndclass;
 
diff --git a/plugins/Ping/src/utils.cpp b/plugins/Ping/src/utils.cpp
index 9e4361538e..2e813cd598 100644
--- a/plugins/Ping/src/utils.cpp
+++ b/plugins/Ping/src/utils.cpp
@@ -181,7 +181,7 @@ INT_PTR ToggleEnabled(WPARAM wParam, LPARAM) {
 INT_PTR EditContact(WPARAM wParam, LPARAM)
 {
 	PINGLIST pl;
-	HWND hwndList = pcli->hwndContactList;
+	HWND hwndList = g_CLI.hwndContactList;
 
 	CallService(MODULENAME "/GetPingList", 0, (LPARAM)&pl);
 	for (pinglist_it i = pl.begin(); i != pl.end(); ++i) {
-- 
cgit v1.2.3