diff options
| author | George Hazan <ghazan@miranda.im> | 2021-07-17 16:15:33 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-07-17 16:15:33 +0300 |
| commit | ec856b6883cc7e3dbf80b7e55981b1dfd30995e2 (patch) | |
| tree | 09ea72891896ff901b22f696deea0058b8d8ae9c /protocols/ICQ-WIM/src | |
| parent | 8e707034502d958e4a966a62367595c166ad0289 (diff) | |
minor code cleaning
Diffstat (limited to 'protocols/ICQ-WIM/src')
| -rw-r--r-- | protocols/ICQ-WIM/src/main.cpp | 12 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/stdafx.h | 1 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/utils.cpp | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/protocols/ICQ-WIM/src/main.cpp b/protocols/ICQ-WIM/src/main.cpp index f83b498647..5d0e93204b 100644 --- a/protocols/ICQ-WIM/src/main.cpp +++ b/protocols/ICQ-WIM/src/main.cpp @@ -22,12 +22,6 @@ bool g_bSecureIM, g_bMessageState; -IconItem iconList[] = -{ - { LPGEN("E-mail"), "icq_email", IDI_INBOX }, - { LPGEN("E-mail notification"), "icq_email_notif", IDI_MAIL_NOTIFY } -}; - ///////////////////////////////////////////////////////////////////////////////////////// static PLUGININFOEX pluginInfoEx = { @@ -88,6 +82,12 @@ static int OnModulesLoaded(WPARAM, LPARAM) return 0; } +static IconItem iconList[] = +{ + { LPGEN("E-mail"), "icq_email", IDI_INBOX }, + { LPGEN("E-mail notification"), "icq_email_notif", IDI_MAIL_NOTIFY } +}; + int CMPlugin::Load() { // register the second instance of this plugin as MRA diff --git a/protocols/ICQ-WIM/src/stdafx.h b/protocols/ICQ-WIM/src/stdafx.h index 2d9f2b66f5..0761099b7f 100644 --- a/protocols/ICQ-WIM/src/stdafx.h +++ b/protocols/ICQ-WIM/src/stdafx.h @@ -106,4 +106,3 @@ int StatusFromString(const CMStringW&); char* time2text(time_t time); extern bool g_bSecureIM, g_bMessageState; -extern IconItem iconList[]; diff --git a/protocols/ICQ-WIM/src/utils.cpp b/protocols/ICQ-WIM/src/utils.cpp index 30e1dcc575..b8d380f05d 100644 --- a/protocols/ICQ-WIM/src/utils.cpp +++ b/protocols/ICQ-WIM/src/utils.cpp @@ -347,7 +347,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA void CIcqProto::EmailNotification(const wchar_t *pwszText) { POPUPDATAW Popup = {}; - Popup.lchIcon = IcoLib_GetIconByHandle(iconList[0].hIcolib); + Popup.lchIcon = g_plugin.getIcon(IDI_INBOX); wcsncpy_s(Popup.lpwzText, pwszText, _TRUNCATE); wcsncpy_s(Popup.lpwzContactName, m_tszUserName, _TRUNCATE); Popup.iSeconds = 20; @@ -370,7 +370,7 @@ void CIcqProto::EmailNotification(const wchar_t *pwszText) CLISTEVENT cle = {}; cle.hDbEvent = ICQ_FAKE_EVENT_ID; cle.moduleName = m_szModuleName; - cle.hIcon = IcoLib_GetIconByHandle(iconList[0].hIcolib); + cle.hIcon = g_plugin.getIcon(IDI_INBOX); cle.flags = CLEF_UNICODE | CLEF_PROTOCOLGLOBAL; cle.pszService = szServiceFunction; cle.szTooltip.w = pwszText; |