From 1340b3b8f0e597797b99814c5ed0496cb3429a2a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 22 May 2018 19:45:53 +0300 Subject: m_chat.h => CMPlugin --- include/m_chat.h | 2 +- protocols/Discord/src/groupchat.cpp | 2 +- protocols/FacebookRM/src/chat.cpp | 4 ++-- protocols/IRCG/src/services.cpp | 4 ++-- protocols/JabberG/src/jabber_chat.cpp | 4 ++-- protocols/MSN/src/msn_chat.cpp | 6 +++--- protocols/SkypeWeb/src/skype_chatrooms.cpp | 4 ++-- protocols/VKontakte/src/vk_chats.cpp | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/m_chat.h b/include/m_chat.h index c302e1e5b5..906b7c616a 100644 --- a/include/m_chat.h +++ b/include/m_chat.h @@ -534,7 +534,7 @@ typedef struct { #define ME_GC_BUILDMENU "GChat/BuildMenu" -EXTERN_C MIR_APP_DLL(void) Chat_AddMenuItems(HMENU hMenu, int nItems, const gc_item *Item, int = hLangpack); +EXTERN_C MIR_APP_DLL(void) Chat_AddMenuItems(HMENU hMenu, int nItems, const gc_item *Item, int langId); ////////////////////////////////////////////////////////////////////////// // Get Chat ToolTip Text for buddy diff --git a/protocols/Discord/src/groupchat.cpp b/protocols/Discord/src/groupchat.cpp index 1492a58800..2c4b177313 100644 --- a/protocols/Discord/src/groupchat.cpp +++ b/protocols/Discord/src/groupchat.cpp @@ -61,7 +61,7 @@ int CDiscordProto::GroupchatMenuHook(WPARAM, LPARAM lParam) return 0; if (gcmi->Type == MENU_ON_LOG) - Chat_AddMenuItems(gcmi->hMenu, _countof(sttLogListItems), sttLogListItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(sttLogListItems), sttLogListItems, g_plugin.m_hLang); return 0; } diff --git a/protocols/FacebookRM/src/chat.cpp b/protocols/FacebookRM/src/chat.cpp index 61c6fcd14a..077a6b4113 100644 --- a/protocols/FacebookRM/src/chat.cpp +++ b/protocols/FacebookRM/src/chat.cpp @@ -339,9 +339,9 @@ int FacebookProto::OnGCMenuHook(WPARAM, LPARAM lParam) return 0; if (gcmi->Type == MENU_ON_LOG) - Chat_AddMenuItems(gcmi->hMenu, _countof(LogMenuItems), LogMenuItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(LogMenuItems), LogMenuItems, g_plugin.m_hLang); else if (gcmi->Type == MENU_ON_NICKLIST) - Chat_AddMenuItems(gcmi->hMenu, _countof(NickMenuItems), NickMenuItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(NickMenuItems), NickMenuItems, g_plugin.m_hLang); return 0; } diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index c1dae9c492..920eef758e 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -796,7 +796,7 @@ int __cdecl CIrcProto::GCMenuHook(WPARAM, LPARAM lParam) if (!mir_strcmpi(gcmi->pszModule, m_szModuleName)) { if (gcmi->Type == MENU_ON_LOG) { if (mir_wstrcmpi(gcmi->pszID, SERVERWINDOW)) - Chat_AddMenuItems(gcmi->hMenu, _countof(logItems), logItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(logItems), logItems, g_plugin.m_hLang); } if (gcmi->Type == MENU_ON_NICKLIST) { @@ -829,7 +829,7 @@ int __cdecl CIrcProto::GCMenuHook(WPARAM, LPARAM lParam) nickItems[7].bDisabled = nickItems[8].bDisabled = nickItems[9].bDisabled = nickItems[10].bDisabled = !(bForceEnable || bOwner); nickItems[11].bDisabled = nickItems[12].bDisabled = nickItems[13].bDisabled = nickItems[14].bDisabled = !(bForceEnable || bOp || bAdmin || bOwner); - Chat_AddMenuItems(gcmi->hMenu, _countof(nickItems), nickItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(nickItems), nickItems, g_plugin.m_hLang); } } } diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 142fe7b535..df81e4cd9f 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -540,7 +540,7 @@ int CJabberProto::JabberGcMenuHook(WPARAM, LPARAM lParam) if (m_ThreadInfo->jabberServerCaps & JABBER_CAPS_PRIVATE_STORAGE) sttSetupGcMenuItem(_countof(sttLogListItems), sttLogListItems, IDM_BOOKMARKS, FALSE); } - Chat_AddMenuItems(gcmi->hMenu, _countof(sttLogListItems), sttLogListItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(sttLogListItems), sttLogListItems, g_plugin.m_hLang); } else if (gcmi->Type == MENU_ON_NICKLIST) { static DWORD sttRJidItems[] = { IDM_RJID_VCARD, IDM_RJID_ADD, IDM_RJID_COPY, 0 }; @@ -615,7 +615,7 @@ int CJabberProto::JabberGcMenuHook(WPARAM, LPARAM lParam) sttListItems[2].uType = 0; sttShowGcMenuItems(_countof(sttListItems), sttListItems, sttRJidItems, 0); } - Chat_AddMenuItems(gcmi->hMenu, _countof(sttListItems), sttListItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(sttListItems), sttListItems, g_plugin.m_hLang); } return 0; diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index 140bb2fdf6..02979b22a0 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); + Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, g_plugin.m_hLang); } 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); + Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, g_plugin.m_hLang); } 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); + Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, g_plugin.m_hLang); } mir_free(email); } diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp index 2ff7f8140a..1e0401e648 100644 --- a/protocols/SkypeWeb/src/skype_chatrooms.cpp +++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp @@ -577,7 +577,7 @@ int CSkypeProto::OnGroupChatMenuHook(WPARAM, LPARAM lParam) { LPGENW("&Leave chat session"), 20, MENU_ITEM, FALSE }, { LPGENW("&Change topic..."), 30, MENU_ITEM, FALSE } }; - Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items); + Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, g_plugin.m_hLang); } else if (gcmi->Type == MENU_ON_NICKLIST) { static const struct gc_item Items[] = @@ -589,7 +589,7 @@ int CSkypeProto::OnGroupChatMenuHook(WPARAM, LPARAM lParam) { LPGENW("&User"), 40, MENU_POPUPITEM }, { LPGENW("Change nick..."), 50, MENU_ITEM }, }; - Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items); + Chat_AddMenuItems(gcmi->hMenu, _countof(Items), Items, g_plugin.m_hLang); } return 0; diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp index 4d76ddf50e..91349b1d5d 100644 --- a/protocols/VKontakte/src/vk_chats.cpp +++ b/protocols/VKontakte/src/vk_chats.cpp @@ -782,9 +782,9 @@ int CVkProto::OnGcMenuHook(WPARAM, LPARAM lParam) return 0; if (gcmi->Type == MENU_ON_LOG) - Chat_AddMenuItems(gcmi->hMenu, _countof(sttLogListItems), sttLogListItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(sttLogListItems), sttLogListItems, g_plugin.m_hLang); else if (gcmi->Type == MENU_ON_NICKLIST) - Chat_AddMenuItems(gcmi->hMenu, _countof(sttListItems), sttListItems); + Chat_AddMenuItems(gcmi->hMenu, _countof(sttListItems), sttListItems, g_plugin.m_hLang); return 0; } -- cgit v1.2.3