diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-11 21:32:58 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-11 21:33:11 +0300 |
| commit | f719c8b921c7a46b76453476204224d40c682914 (patch) | |
| tree | c6d92dc450893e7f5abe60c2046ec9c2d1e3db36 /protocols/MSN | |
| parent | 16ad355c8bdc438c3107ee3ba3ad0bf0b8c395fa (diff) | |
int hLangpack/m_hLang removed and replaced with HPLUGIN
Diffstat (limited to 'protocols/MSN')
| -rw-r--r-- | protocols/MSN/src/msn_chat.cpp | 6 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_menu.cpp | 4 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_opts.cpp | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index 02979b22a0..4278ebc8c0 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -558,7 +558,7 @@ int CMsnProto::MSN_GCMenuHook(WPARAM, LPARAM lParam) { LPGENW("&Invite user..."), 10, MENU_ITEM, FALSE },
{ LPGENW("&Leave chat session"), 20, MENU_ITEM, FALSE }
};
- Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, g_plugin.m_hLang);
+ Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, &g_plugin);
}
else if (gcmi->Type == MENU_ON_NICKLIST) {
char *email = mir_u2a(gcmi->pszUID);
@@ -570,7 +570,7 @@ int CMsnProto::MSN_GCMenuHook(WPARAM, LPARAM lParam) { L"", 100, MENU_SEPARATOR, FALSE },
{ LPGENW("&Leave chat session"), 110, MENU_ITEM, FALSE }
};
- Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, g_plugin.m_hLang);
+ Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, &g_plugin);
}
else {
static struct gc_item Items[] =
@@ -590,7 +590,7 @@ int CMsnProto::MSN_GCMenuHook(WPARAM, LPARAM lParam) if (pszRole && !mir_wstrcmpi(pszRole, L"admin"))
Items[3].pszDesc = LPGENW("&Deop user");
}
- Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, g_plugin.m_hLang);
+ Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, &g_plugin);
}
mir_free(email);
}
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index bcafc431b8..39fdb52c77 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -141,7 +141,7 @@ int CMsnProto::OnContactDoubleClicked(WPARAM hContact, LPARAM) // Menus initialization
void CMsnProto::OnBuildProtoMenu(void)
{
- CMenuItem mi(g_plugin);
+ CMenuItem mi(&g_plugin);
mi.root = Menu_GetProtocolRoot(this);
mi.pszService = MSN_INVITE;
@@ -225,7 +225,7 @@ void MSN_InitContactMenu(void) mir_strcpy(servicefunction, "MSN");
char* tDest = servicefunction + mir_strlen(servicefunction);
- CMenuItem mi(g_plugin);
+ CMenuItem mi(&g_plugin);
mi.pszService = servicefunction;
SET_UID(mi, 0xc6169b8f, 0x53ab, 0x4242, 0xbe, 0x90, 0xe2, 0x4a, 0xa5, 0x73, 0x88, 0x32);
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 0a45df570a..5f2f881d1c 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -591,9 +591,8 @@ INT_PTR CALLBACK DlgDeleteContactUI(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int CMsnProto::OnOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { 0 };
+ OPTIONSDIALOGPAGE odp = {};
odp.position = -790000000;
- odp.hInstance = g_plugin.getInst();
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN);
odp.szTitle.w = m_tszUserName;
odp.szGroup.w = LPGENW("Network");
|