diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-29 20:10:40 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-29 20:10:40 +0000 |
| commit | 916c8dea1e49bbfcf7503fc83db63ddc94648f9b (patch) | |
| tree | 04b54b1ba8f482121d689cead7da679f444e4b1c /protocols | |
| parent | 28b5f3536672bdfa6b3ed76a8483424453108b7a (diff) | |
ownerData isolated inside TMO_IntMenuItem not to allow external structures to play with it
git-svn-id: http://svn.miranda-ng.org/main/trunk@14443 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Gadu-Gadu/src/links.cpp | 5 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp index 5a5b75df90..e64432a3b1 100644 --- a/protocols/Gadu-Gadu/src/links.cpp +++ b/protocols/Gadu-Gadu/src/links.cpp @@ -101,7 +101,7 @@ void gg_links_instancemenu_init() mi.name.a = "Cancel";
mi.position = 9999999;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);
- Menu_AddItem(hInstanceMenu, &mi);
+ Menu_AddItem(hInstanceMenu, &mi, NULL);
}
void gg_links_init()
@@ -117,9 +117,8 @@ void GGPROTO::links_instance_init() if (ServiceExists(MS_ASSOCMGR_ADDNEWURLTYPE)) {
CMenuItem mi;
mi.flags = CMIF_TCHAR;
- mi.ownerdata = this;
mi.position = g_Instances.getCount();
mi.name.t = m_tszUserName;
- hInstanceMenuItem = Menu_AddItem(hInstanceMenu, &mi);
+ hInstanceMenuItem = Menu_AddItem(hInstanceMenu, &mi, this);
}
}
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 11b651c68e..88f3746d36 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -193,7 +193,7 @@ void g_MenuInit(void) mi.name.a = "Cancel";
mi.position = 9999999;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);
- Menu_AddItem(hChooserMenu, &mi);
+ Menu_AddItem(hChooserMenu, &mi, NULL);
}
//////////////////////////////////////////////////////////////////////////////////////
@@ -784,10 +784,9 @@ void CJabberProto::GlobalMenuInit() CMenuItem mi;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.ownerdata = this;
mi.position = iChooserMenuPos++;
mi.name.t = m_tszUserName;
- m_hChooseMenuItem = Menu_AddItem(hChooserMenu, &mi);
+ m_hChooseMenuItem = Menu_AddItem(hChooserMenu, &mi, this);
//////////////////////////////////////////////////////////////////////////////////////
// Hotkeys
|