From b3d3b95a16be5b1785681f0f6fdc3bcdb967a42e Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 8 Dec 2017 04:42:36 +0300 Subject: new_gpg: get rid of "extern chaos" - moving ui related code to separated file, split definition and implementation of ui --- plugins/New_GPG/src/icons.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) mode change 100644 => 100755 plugins/New_GPG/src/icons.cpp (limited to 'plugins/New_GPG/src/icons.cpp') diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp old mode 100644 new mode 100755 index c78075418e..f868cb705b --- a/plugins/New_GPG/src/icons.cpp +++ b/plugins/New_GPG/src/icons.cpp @@ -16,7 +16,6 @@ #include "stdafx.h" -extern HINSTANCE hInst; static IconItem iconList[] = { @@ -26,7 +25,7 @@ static IconItem iconList[] = void InitIconLib() { - Icon_Register(hInst, szGPGModuleName, iconList, _countof(iconList)); + Icon_Register(globals.hInst, szGPGModuleName, iconList, _countof(iconList)); } HANDLE IconLibHookIconsChanged(MIRANDAHOOK hook) @@ -37,12 +36,11 @@ HANDLE IconLibHookIconsChanged(MIRANDAHOOK hook) void setClistIcon(MCONTACT hContact) { bool enabled = isContactSecured(hContact); - extern HANDLE g_hCLIcon; MCONTACT hMC = db_mc_tryMeta(hContact); const char *szIconId = (enabled) ? "secured" : nullptr; - ExtraIcon_SetIconByName(g_hCLIcon, hContact, szIconId); + ExtraIcon_SetIconByName(globals.g_hCLIcon, hContact, szIconId); if(hMC != hContact) - ExtraIcon_SetIconByName(g_hCLIcon, hMC, szIconId); + ExtraIcon_SetIconByName(globals.g_hCLIcon, hMC, szIconId); } void setSrmmIcon(MCONTACT h) -- cgit v1.2.3