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/UserInfoEx/src/dlg_propsheet.cpp          | 2 +-
 plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp | 4 ++--
 plugins/UserInfoEx/src/init.cpp                   | 4 ----
 plugins/UserInfoEx/src/mir_menuitems.cpp          | 8 ++++----
 plugins/UserInfoEx/src/svc_reminder.cpp           | 2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'plugins/UserInfoEx/src')

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 2bc8a85ab3..30832b7889 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -1514,7 +1514,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 
 				pPs->dwFlags &= ~PSF_CHANGED;
 				EnableWindow(GetDlgItem(hDlg, IDAPPLY), FALSE);
-				pcli->pfnInvalidateDisplayNameCacheEntry(pPs->hContact);
+				g_CLI.pfnInvalidateDisplayNameCacheEntry(pPs->hContact);
 
 				// need to upload owners settings
 				if (!pPs->hContact && myGlobals.CanChangeDetails && db_get_b(NULL, MODULENAME, SET_PROPSHEET_CHANGEMYDETAILS, FALSE)) {
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index b7ddb5b4a7..458a9ea3de 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -266,7 +266,7 @@ INT_PTR svcExIm_Group_Service(WPARAM wParam, LPARAM)
 	LPTSTR ptszGroup = tszGroup;
 	LPTSTR ptszItem = tszItem;
 
-	HWND hClist = pcli->hwndContactTree;
+	HWND hClist = g_CLI.hwndContactTree;
 	// get clist selection
 	hItem = SendMessage(hClist,CLM_GETSELECTION,0,0);
 	hRoot = SendMessage(hClist,CLM_GETNEXTITEM, (WPARAM)CLGN_ROOT, (LPARAM)hItem);
@@ -325,7 +325,7 @@ INT_PTR svcExIm_Account_Service(WPARAM, LPARAM lParam)
 {
 	ExImParam ExIm;
 	memset(&ExIm, 0, sizeof(ExIm));
-	HWND hClist = pcli->hwndContactTree;
+	HWND hClist = g_CLI.hwndContactTree;
 	lpStatusMenuExecParam smep = (lpStatusMenuExecParam)Menu_GetItemData((HGENMENU)lParam);
 	ExIm.pszName = mir_strdup(smep->proto);
 	ExIm.Typ = EXIM_ACCOUNT;
diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp
index 25334f92f6..ce0260655c 100644
--- a/plugins/UserInfoEx/src/init.cpp
+++ b/plugins/UserInfoEx/src/init.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "stdafx.h"
 
-CLIST_INTERFACE *pcli;
 CMPlugin g_plugin;
 HMODULE hDwmApi;
 
@@ -160,9 +159,6 @@ extern "C" int __declspec(dllexport) Load(void)
 
 	memset(&myGlobals, 0, sizeof(MGLOBAL));
 
-	// init clist interface
-	pcli = Clist_GetInterface();
-
 	if (IsWinVerVistaPlus()) {
 		hDwmApi = LoadLibraryA("dwmapi.dll");
 		if (hDwmApi)
diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp
index dd84444186..ea97bdaa89 100644
--- a/plugins/UserInfoEx/src/mir_menuitems.cpp
+++ b/plugins/UserInfoEx/src/mir_menuitems.cpp
@@ -489,14 +489,14 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
 
 	// on call by hook or first start
 	if (!lParam || !hMenuItemAccount) {
-		size_t sizeNew = mItems * pcli->menuProtos->getCount() * sizeof(HGENMENU);
+		size_t sizeNew = mItems * g_CLI.menuProtos->getCount() * sizeof(HGENMENU);
 		hMenuItemAccount = (HGENMENU*)mir_realloc(hMenuItemAccount, sizeNew);
 		// set all bytes 0 to avoid problems
 		memset(hMenuItemAccount, 0, sizeNew);
 	}
 	// on options change
 	else // delete all MenuItems backward (first item second group)
-		RemoveMenuItems(hMenuItemAccount, mItems * pcli->menuProtos->getCount());
+		RemoveMenuItems(hMenuItemAccount, mItems * g_CLI.menuProtos->getCount());
 
 	// load options
 	int flag = db_get_b(NULL, MODULENAME, SET_MI_ACCOUNT, MCAS_NOTINITIATED);
@@ -506,7 +506,7 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
 	}
 
 	// loop for all account names
-	for (auto &it : *pcli->menuProtos) {
+	for (auto &it : *g_CLI.menuProtos) {
 		// set all bytes 0 to avoid problems
 		item = 0;
 
@@ -527,7 +527,7 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
 		// support new genmenu style
 		mi.root = mhRoot;
 
-		int i = pcli->menuProtos->indexOf(&it);
+		int i = g_CLI.menuProtos->indexOf(&it);
 		switch (flag) {
 		case 3:
 			// cascade off
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index 9b1b7a9f8b..4c4cc084a6 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -335,7 +335,7 @@ static void NotifyFlashCListIcon(MCONTACT hContact, const CEvent &evt)
 	// pszService = "dummy" get 'service not fount' and continue;
 	cle.pszService = "dummy";
 	cle.lParam = NULL;
-	pcli->pfnAddEvent(&cle);
+	g_CLI.pfnAddEvent(&cle);
 }
 
 /**
-- 
cgit v1.2.3