diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-12-08 04:42:36 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-12-08 05:05:53 +0300 |
| commit | b3d3b95a16be5b1785681f0f6fdc3bcdb967a42e (patch) | |
| tree | d507c610892797e467f8a0b1fc5d8b088b1e6bee /plugins/New_GPG/src/icons.cpp | |
| parent | 75f678d3a4f23536e2170582dabd740eb195fa17 (diff) | |
new_gpg: get rid of "extern chaos"
- moving ui related code to separated file, split definition and implementation of ui
Diffstat (limited to 'plugins/New_GPG/src/icons.cpp')
| -rwxr-xr-x[-rw-r--r--] | plugins/New_GPG/src/icons.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp index c78075418e..f868cb705b 100644..100755 --- 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) |