summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp12
-rw-r--r--plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp12
-rw-r--r--plugins/FileAsMessage/src/main.cpp1
-rw-r--r--plugins/MenuItemEx/src/main.cpp2
-rwxr-xr-xplugins/Msg_Export/src/main.cpp2
-rw-r--r--plugins/MyDetails/src/mydetails.cpp4
-rw-r--r--plugins/TabSRMM/src/globals.cpp2
7 files changed, 14 insertions, 21 deletions
diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index df9afbc0ab..c3240e099b 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -830,7 +830,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
mi.position = popuppos++;
mi.pszName = LPGEN("&Top");
mi.pszService = CLUIFRAMESSETALIGNALTOP;
- mi.pszContactOwner = (char *)alTop;
+ mi.pszContactOwner = (char*)alTop;
menuid = pfnAdd(&mi);
if (frameid == -1) _hmiAlignTop = menuid;
else g_pfwFrames[framepos].MenuHandles.MIAlignTop = menuid;
@@ -840,7 +840,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
mi.position = popuppos++;
mi.pszName = LPGEN("&Client");
mi.pszService = CLUIFRAMESSETALIGNALCLIENT;
- mi.pszContactOwner = (char *)alClient;
+ mi.pszContactOwner = (char*)alClient;
menuid = pfnAdd(&mi);
if (frameid == -1) _hmiAlignClient = menuid;
else g_pfwFrames[framepos].MenuHandles.MIAlignClient = menuid;
@@ -849,7 +849,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
mi.position = popuppos++;
mi.pszName = LPGEN("&Bottom");
mi.pszService = CLUIFRAMESSETALIGNALBOTTOM;
- mi.pszContactOwner = (char *)alBottom;
+ mi.pszContactOwner = (char*)alBottom;
menuid = pfnAdd(&mi);
if (frameid == -1) _hmiAlignBottom = menuid;
else g_pfwFrames[framepos].MenuHandles.MIAlignBottom = menuid;
@@ -860,7 +860,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
mi.pszName = LPGEN("&Position");
mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTPOPUP;
mi.pszService = "";
- mi.pszContactOwner = (char *)0;
+ mi.pszContactOwner = (char*)0;
menuid = pfnAdd(&mi);
if (frameid == -1) _hmiPosRoot = menuid;
else g_pfwFrames[framepos].MenuHandles.MIPosRoot = menuid;
@@ -870,7 +870,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
mi.pszName = LPGEN("&Up");
mi.flags = CMIF_CHILDPOPUP;
mi.pszService = CLUIFRAMESMOVEUP;
- mi.pszContactOwner = (char *)1;
+ mi.pszContactOwner = (char*)1;
menuid = pfnAdd(&mi);
if (frameid == -1) _hmiPosUp = menuid;
else g_pfwFrames[framepos].MenuHandles.MIPosUp = menuid;
@@ -878,7 +878,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
mi.position = popuppos++;
mi.pszName = LPGEN("&Down");
mi.pszService = CLUIFRAMESMOVEDOWN;
- mi.pszContactOwner = (char *)-1;
+ mi.pszContactOwner = (char*)-1;
menuid = pfnAdd(&mi);
if (frameid == -1) _hmiPosDown = menuid;
else g_pfwFrames[framepos].MenuHandles.MIPosDown = menuid;
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index f511244c27..e791c07baa 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -676,7 +676,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
mi.position = popuppos++;
mi.pszName = LPGEN("&Top");
mi.pszService = CLUIFRAMESSETALIGNALTOP;
- mi.pszContactOwner = (char *)alTop;
+ mi.pszContactOwner = (char*)alTop;
menuid = pfnAdd(&mi);
if (frameid == -1) contMIAlignTop = menuid;
else Frames[framepos].MenuHandles.MIAlignTop = menuid;
@@ -685,7 +685,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
mi.position = popuppos++;
mi.pszName = LPGEN("&Client");
mi.pszService = CLUIFRAMESSETALIGNALCLIENT;
- mi.pszContactOwner = (char *)alClient;
+ mi.pszContactOwner = (char*)alClient;
menuid = pfnAdd(&mi);
if (frameid == -1) contMIAlignClient = menuid;
else Frames[framepos].MenuHandles.MIAlignClient = menuid;
@@ -694,7 +694,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
mi.position = popuppos++;
mi.pszName = LPGEN("&Bottom");
mi.pszService = CLUIFRAMESSETALIGNALBOTTOM;
- mi.pszContactOwner = (char *)alBottom;
+ mi.pszContactOwner = (char*)alBottom;
menuid = pfnAdd(&mi);
if (frameid == -1) contMIAlignBottom = menuid;
else Frames[framepos].MenuHandles.MIAlignBottom = menuid;
@@ -706,7 +706,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
mi.pszName = LPGEN("&Position");
mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTPOPUP;
mi.pszService = "";
- mi.pszContactOwner = (char *)0;
+ mi.pszContactOwner = (char*)0;
menuid = pfnAdd(&mi);
mi.hParentMenu = menuid;
@@ -714,14 +714,14 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
mi.pszName = LPGEN("&Up");
mi.flags = CMIF_CHILDPOPUP;
mi.pszService = CLUIFRAMESMOVEUP;
- mi.pszContactOwner = (char *)1;
+ mi.pszContactOwner = (char*)1;
pfnAdd(&mi);
mi.position = popuppos++;
mi.pszName = LPGEN("&Down");
mi.flags = CMIF_CHILDPOPUP;
mi.pszService = CLUIFRAMESMOVEDOWN;
- mi.pszContactOwner = (char *)-1;
+ mi.pszContactOwner = (char*)-1;
pfnAdd(&mi);
return 0;
}
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 279307f86f..ae7188e548 100644
--- a/plugins/FileAsMessage/src/main.cpp
+++ b/plugins/FileAsMessage/src/main.cpp
@@ -179,7 +179,6 @@ static int OnModulesLoaded(WPARAM wparam, LPARAM lparam)
mi.hIcon = hIcons[ICON_MAIN];
mi.pszName = LPGEN("File As Message...");
mi.pszService = SERVICE_NAME "/FESendFile";
- mi.pszContactOwner = NULL;
mi.flags = CMIF_NOTOFFLINE;
Menu_AddContactMenuItem(&mi);
return 0;
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index b3716522f7..e7ab90d826 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -959,8 +959,6 @@ static int PluginInit(WPARAM, LPARAM)
CLISTMENUITEM mi = { 0 };
mi.flags = CMIF_UNICODE;
- mi.hIcon = NULL;
- mi.pszContactOwner = NULL;
mi.position = 120000;
mi.ptszName = LPGENT("Always visible");
diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp
index 144d80eec2..7a0b2e571d 100755
--- a/plugins/Msg_Export/src/main.cpp
+++ b/plugins/Msg_Export/src/main.cpp
@@ -115,8 +115,6 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/)
if (!bReplaceHistory)
{
CLISTMENUITEM mi = { 0 };
- mi.flags = 0;
- mi.pszContactOwner = NULL; //all contacts
mi.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_EXPORT_MESSAGE));
mi.position = 1000090100;
mi.pszName = LPGEN("Open E&xported History");
diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index 76ed521dcd..f9d321e780 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -91,10 +91,10 @@ static int MainInit(WPARAM, LPARAM)
mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;
mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);
mi.ptszName = LPGENT("My details");
- HANDLE hMenuRoot = Menu_AddMainMenuItem(&mi);
+ HGENMENU hMenuRoot = Menu_AddMainMenuItem(&mi);
mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;
- mi.ptszPopupName = (TCHAR *)hMenuRoot;
+ mi.hParentMenu = hMenuRoot;
mi.popupPosition = 0;
mi.icolibItem = NULL;
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 8707a2f165..fa8c3b2bf5 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -328,7 +328,6 @@ int CGlobals::ModulesLoaded(WPARAM, LPARAM)
CLISTMENUITEM mi = { 0 };
mi.position = -500050005;
mi.hIcon = PluginConfig.g_iconContainer;
- mi.pszContactOwner = NULL;
mi.pszName = LPGEN("&Messaging settings...");
mi.pszService = MS_TABMSG_SETUSERPREFS;
PluginConfig.m_UserMenuItem = Menu_AddContactMenuItem(&mi);
@@ -336,7 +335,6 @@ int CGlobals::ModulesLoaded(WPARAM, LPARAM)
if (sendLater->isAvail()) {
mi.position = -500050006;
mi.hIcon = 0;
- mi.pszContactOwner = NULL;
mi.pszName = LPGEN("&Send later job list...");
mi.pszService = MS_TABMSG_SLQMGR;
PluginConfig.m_UserMenuItem = Menu_AddMainMenuItem(&mi);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 16:49:39 +0000