diff options
author | George Hazan <george.hazan@gmail.com> | 2015-06-26 22:03:02 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-06-26 22:03:02 +0000 |
commit | be616d81bdaf8fd4ae61b0a145fb81bbdf467994 (patch) | |
tree | c0d4798a8e882583f74eb166508e0f4ce96bd4e4 /plugins/SecureIM/src | |
parent | c89c550677f40d8b2010de442053cba81ba06d96 (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 'plugins/SecureIM/src')
-rw-r--r-- | plugins/SecureIM/src/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index 7fb923a5bb..670b86fc79 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -48,13 +48,13 @@ static HGENMENU AddMenuItem(LPCSTR name, int pos, HICON hicon, LPCSTR service, i return Menu_AddContactMenuItem(&mi);
}
-static HGENMENU AddSubItem(HANDLE rootid, LPCSTR name, int pos, int poppos, LPCSTR service, WPARAM wParam = 0)
+static HGENMENU AddSubItem(HGENMENU hRoot, LPCSTR name, int pos, int poppos, LPCSTR service, WPARAM wParam = 0)
{
CLISTMENUITEM mi = { 0 };
- mi.flags = CMIF_ROOTHANDLE | CMIF_HIDDEN;
+ mi.flags = CMIF_HIDDEN;
mi.position = pos;
mi.pszName = (char*)name;
- mi.pszPopupName = (char*)rootid;
+ mi.hParentMenu = hRoot;
mi.pszService = (char*)service;
HGENMENU res = Menu_AddContactMenuItem(&mi);
Menu_ConfigureItem(res, MCI_OPT_EXECPARAM, poppos);
@@ -235,7 +235,7 @@ static int onModulesLoaded(WPARAM, LPARAM) g_hMenu[1] = AddMenuItem(sim302, 110001, g_hICO[ICO_CM_DIS], MODULENAME"/SIM_DIS", CMIF_NOTOFFLINE);
if (ServiceExists(MS_CLIST_MENUBUILDSUBGROUP)) {
- g_hMenu[2] = AddMenuItem(sim312[0], 110002, NULL, NULL, CMIF_ROOTHANDLE);
+ g_hMenu[2] = AddMenuItem(sim312[0], 110002, NULL, NULL);
g_hMenu[3] = AddSubItem(g_hMenu[2], sim232[0], 110003, 110002, MODULENAME"/SIM_ST_DIS");
g_hMenu[4] = AddSubItem(g_hMenu[2], sim232[1], 110004, 110002, MODULENAME"/SIM_ST_ENA");
g_hMenu[5] = AddSubItem(g_hMenu[2], sim232[2], 110005, 110002, MODULENAME"/SIM_ST_TRY");
@@ -258,7 +258,7 @@ static int onModulesLoaded(WPARAM, LPARAM) }
if (ServiceExists(MS_CLIST_MENUBUILDSUBGROUP)) {
- g_hMenu[10] = AddMenuItem(sim311[0], 110010, NULL, NULL, CMIF_ROOTHANDLE);
+ g_hMenu[10] = AddMenuItem(sim311[0], 110010, NULL, NULL);
g_hMenu[11] = AddSubItem(g_hMenu[10], sim231[0], 110011, 110010, MODULENAME"/MODE_NAT");
g_hMenu[12] = AddSubItem(g_hMenu[10], sim231[1], 110012, 110010, MODULENAME"/MODE_PGP");
g_hMenu[13] = AddSubItem(g_hMenu[10], sim231[2], 110013, 110010, MODULENAME"/MODE_GPG");
|