summaryrefslogtreecommitdiff
path: root/protocols/MRA/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-06-26 22:03:02 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-06-26 22:03:02 +0000
commitbe616d81bdaf8fd4ae61b0a145fb81bbdf467994 (patch)
treec0d4798a8e882583f74eb166508e0f4ce96bd4e4 /protocols/MRA/src
parentc89c550677f40d8b2010de442053cba81ba06d96 (diff)
YEEHAW! CLISTMENUITEM::pszPopupName also died
git-svn-id: http://svn.miranda-ng.org/main/trunk@14404 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src')
-rw-r--r--protocols/MRA/src/Mra_menus.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index fe73fa2ca1..a8ad1ff78d 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -286,8 +286,7 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM)
CLISTMENUITEM mi = { 0 };
mi.position = 2000060000;
- // mi.popupPosition = 500085000;
- mi.ptszPopupName = szItem;
+ mi.hParentMenu = Menu_CreateRoot(MO_STATUS, szItem, 500085000);
mi.flags = CMIF_UNICODE;
mi.pszService = szServiceFunction;
mi.pszContactOwner = m_szModuleName;
@@ -338,27 +337,24 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI
hRootMenu = Menu_GetProtocolRoot(m_szModuleName);
if (hRootMenu == NULL) {
mi.ptszName = m_tszUserName;
- mi.hParentMenu = HGENMENU_ROOT;
- mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+ mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
mi.hIcon = g_hMainIcon;
hRootMenu = Menu_AddProtoMenuItem(&mi);
}
mi.position = 20003;
mi.hParentMenu = hRootMenu;
- mi.flags = CMIF_ROOTHANDLE;
}
else {
fnAddFunc = Menu_AddContactMenuItem;
mi.position = lPosition;
- mi.flags = CMIF_ROOTHANDLE;
}
+ mi.flags = 0;
mi.pszName = LPGEN("Services...");
mi.hIcon = g_hMainIcon;
hRootMenu = fnAddFunc(&mi);
- mi.flags = CMIF_ROOTHANDLE;
mi.hParentMenu = hRootMenu;
mi.pszService = szServiceFunction;