summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-06-23 12:43:36 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-06-23 12:43:36 +0000
commit7d3d5e16b4e5378a751576095771c2a75b7276fb (patch)
treebda97aa4f8e050d6eeb56f24ad386fef7d5050e0 /protocols
parentf1fb66125cf0747022043cfdc9c83dfb8edb438e (diff)
- Menu_ConfigureItem replaced MO_SETOPTIONSMENUITEM;
- Menu_ConfigureObject replaced MO_SETOPTIONSMENUOBJECT; - TIntMenuObject::hotkey replaced TMenuObject::hotkey git-svn-id: http://svn.miranda-ng.org/main/trunk@14349 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/AimOscar/src/theme.cpp2
-rw-r--r--protocols/FacebookRM/src/theme.cpp2
-rw-r--r--protocols/Gadu-Gadu/src/gg.cpp2
-rw-r--r--protocols/IRCG/src/services.cpp2
-rw-r--r--protocols/JabberG/src/jabber_menu.cpp2
-rw-r--r--protocols/JabberG/src/jabber_privacy.cpp2
-rw-r--r--protocols/JabberG/src/jabber_xstatus.cpp2
-rw-r--r--protocols/MRA/src/Mra_menus.cpp2
-rw-r--r--protocols/MSN/src/msn_menu.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_menus.cpp2
-rw-r--r--protocols/Steam/src/steam_menus.cpp2
-rw-r--r--protocols/Tox/src/tox_menus.cpp2
-rw-r--r--protocols/VKontakte/src/vk_proto.cpp2
-rw-r--r--protocols/WhatsApp/src/theme.cpp2
-rw-r--r--protocols/Yahoo/src/services.cpp2
15 files changed, 15 insertions, 15 deletions
diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index fbfaa67627..f23004803d 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -214,7 +214,7 @@ void CAimProto::InitMainMenus(void)
CLISTMENUITEM mi = { 0 };
- HGENMENU hRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
mi.icolibItem = GetIconHandle("aim");
diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index 7d7c05cdcf..7b7392e49d 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -215,7 +215,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
CLISTMENUITEM mi = { 0 };
mi.pszService = text;
- HGENMENU hRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
CLISTMENUITEM miRoot = { 0 };
miRoot.popupPosition = 500085000;
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index ffeb1ecc65..1cfffa77ee 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -265,7 +265,7 @@ void GGPROTO::menus_init()
{
CLISTMENUITEM mi = { 0 };
- HGENMENU hGCRoot, hCLRoot, hRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hGCRoot, hCLRoot, hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
mi.ptszName = m_tszUserName;
mi.position = 500090000;
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index fc4a4ff834..37e3d70cc0 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -29,7 +29,7 @@ void CIrcProto::InitMainMenus(void)
CLISTMENUITEM mi = { 0 };
mi.pszService = temp;
- HGENMENU hRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
// Root popupmenuitem
mi.ptszName = m_tszUserName;
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 32bccd1ad0..58e54e1297 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -593,7 +593,7 @@ void CJabberProto::MenuInit()
CLISTMENUITEM mi = { 0 };
mi.pszService = text;
- HGENMENU hJabberRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hJabberRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hJabberRoot == NULL) {
mi.ptszName = m_tszUserName;
mi.position = -1999901006;
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 7ade002960..1e3382f92d 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -2096,7 +2096,7 @@ void CJabberProto::BuildPrivacyMenu()
mi.icolibItem = GetIconHandle(IDI_AGENTS);
mi.flags = CMIF_ROOTPOPUP | CMIF_CHILDPOPUP | CMIF_HIDDEN;
mi.pszName = LPGEN("Privacy Lists");
- mi.hParentMenu = MO_GetProtoRootMenu(m_szModuleName);
+ mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);
m_hPrivacyMenuRoot = Menu_AddProtoMenuItem(&mi);
CreateProtoService("/PrivacyLists", &CJabberProto::OnMenuHandlePrivacyLists);
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index bd78e108c4..4c4b472218 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -458,7 +458,7 @@ void CPepGuiService::InitGui()
void CPepGuiService::RebuildMenu()
{
- HGENMENU hJabberRoot = MO_GetProtoRootMenu(m_proto->m_szModuleName);
+ HGENMENU hJabberRoot = Menu_GetProtocolRoot(m_proto->m_szModuleName);
if (hJabberRoot == NULL)
return;
diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index c8f74bae05..740ab95550 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -335,7 +335,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI
if (bIsMain) {
fnAddFunc = Menu_AddProtoMenuItem;
- hRootMenu = MO_GetProtoRootMenu(m_szModuleName);
+ hRootMenu = Menu_GetProtocolRoot(m_szModuleName);
if (hRootMenu == NULL) {
mi.ptszName = m_tszUserName;
mi.hParentMenu = HGENMENU_ROOT;
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index b6897742fc..67f742da1c 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -274,7 +274,7 @@ void CMsnProto::MsnInitMainMenu(void)
CLISTMENUITEM mi = { 0 };
- HGENMENU hRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
mi.popupPosition = 500085000;
mi.hParentMenu = HGENMENU_ROOT;
diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp
index 8f5cc22832..82b805699e 100644
--- a/protocols/SkypeWeb/src/skype_menus.cpp
+++ b/protocols/SkypeWeb/src/skype_menus.cpp
@@ -115,7 +115,7 @@ int CSkypeProto::OnInitStatusMenu()
CLISTMENUITEM mi = { 0 };
mi.pszService = text;
- HGENMENU hStatusMunuRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hStatusMunuRoot = Menu_GetProtocolRoot(m_szModuleName);
if (!hStatusMunuRoot)
{
mi.ptszName = m_tszUserName;
diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp
index e67c73b3ed..eeaec5377a 100644
--- a/protocols/Steam/src/steam_menus.cpp
+++ b/protocols/Steam/src/steam_menus.cpp
@@ -103,7 +103,7 @@ void CSteamProto::OnInitStatusMenu()
CLISTMENUITEM mi = { 0 };
mi.pszService = text;
- HGENMENU hSteamRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hSteamRoot = Menu_GetProtocolRoot(m_szModuleName);
if (!hSteamRoot)
{
mi.ptszName = m_tszUserName;
diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp
index 62781c3046..6753214e3b 100644
--- a/protocols/Tox/src/tox_menus.cpp
+++ b/protocols/Tox/src/tox_menus.cpp
@@ -83,7 +83,7 @@ int CToxProto::OnInitStatusMenu()
CLISTMENUITEM mi = { 0 };
mi.pszService = text;
- HGENMENU hStatusMunuRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hStatusMunuRoot = Menu_GetProtocolRoot(m_szModuleName);
if (!hStatusMunuRoot)
{
mi.ptszName = m_tszUserName;
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index edde181f3c..8652c96d2c 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -196,7 +196,7 @@ void CVkProto::InitMenus()
// Proto menu
mi.flags = CMIF_CHILDPOPUP;
- mi.hParentMenu = MO_GetProtoRootMenu(m_szModuleName);
+ mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);
mir_snprintf(szService, "%s%s", m_szModuleName, PS_CREATECHAT);
mi.pszService = szService;
diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp
index ac5f6ff3ff..6851cc571f 100644
--- a/protocols/WhatsApp/src/theme.cpp
+++ b/protocols/WhatsApp/src/theme.cpp
@@ -54,7 +54,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam)
CLISTMENUITEM mi = { 0 };
mi.pszService = text;
- HGENMENU hRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
mi.popupPosition = 500085000;
mi.hParentMenu = HGENMENU_ROOT;
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index 8f283495a1..d935f50d16 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -372,7 +372,7 @@ void CYahooProto::MenuMainInit(void)
CLISTMENUITEM mi = { 0 };
mi.pszService = servicefunction;
- HGENMENU hRoot = MO_GetProtoRootMenu(m_szModuleName);
+ HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
if (hRoot == NULL) {
mi.position = 500015000;
mi.hParentMenu = HGENMENU_ROOT;