diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Gadu-Gadu/src/links.cpp | 23 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 4 |
2 files changed, 13 insertions, 14 deletions
diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp index 4cb99e7a47..deff5e16c0 100644 --- a/protocols/Gadu-Gadu/src/links.cpp +++ b/protocols/Gadu-Gadu/src/links.cpp @@ -112,12 +112,11 @@ void gg_links_instancemenu_init() CreateServiceFunction(GGS_MENUCHOOSE, gg_menuchoose);
hInstanceMenu = MO_CreateMenuObject("GGAccountChooser", LPGEN("Gadu-Gadu account chooser"), 0, GGS_MENUCHOOSE);
- TMO_MenuItem tmi = {0};
- tmi.cbSize = sizeof(tmi);
- tmi.pszName = "Cancel";
- tmi.position = 9999999;
- tmi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);
- CallService(MO_ADDNEWMENUITEM, (WPARAM)hInstanceMenu, (LPARAM)&tmi);
+ TMO_MenuItem mi = {0};
+ mi.name.a = "Cancel";
+ mi.position = 9999999;
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);
+ CallService(MO_ADDNEWMENUITEM, (WPARAM)hInstanceMenu, (LPARAM)&mi);
}
void gg_links_init()
@@ -131,11 +130,11 @@ void gg_links_init() void GGPROTO::links_instance_init()
{
if (ServiceExists(MS_ASSOCMGR_ADDNEWURLTYPE)) {
- TMO_MenuItem tmi = { sizeof(tmi) };
- tmi.flags = CMIF_TCHAR;
- tmi.ownerdata = this;
- tmi.position = g_Instances.getCount();
- tmi.ptszName = m_tszUserName;
- hInstanceMenuItem = (HGENMENU)CallService(MO_ADDNEWMENUITEM, (WPARAM)hInstanceMenu, (LPARAM)&tmi);
+ TMO_MenuItem mi = { 0 };
+ mi.flags = CMIF_TCHAR;
+ mi.ownerdata = this;
+ mi.position = g_Instances.getCount();
+ mi.name.t = m_tszUserName;
+ hInstanceMenuItem = (HGENMENU)CallService(MO_ADDNEWMENUITEM, (WPARAM)hInstanceMenu, (LPARAM)&mi);
}
}
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index bc8841eeee..3ba484b46c 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -188,7 +188,7 @@ void g_MenuInit(void) hChooserMenu = MO_CreateMenuObject("JabberAccountChooser", LPGEN("Jabber account chooser"), 0, "Jabber/MenuChoose");
TMO_MenuItem tmi = { sizeof(tmi) };
- tmi.pszName = "Cancel";
+ tmi.name.a = "Cancel";
tmi.position = 9999999;
tmi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);
CallService(MO_ADDNEWMENUITEM, (WPARAM)hChooserMenu, (LPARAM)&tmi);
@@ -818,7 +818,7 @@ void CJabberProto::GlobalMenuInit() tmi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
tmi.ownerdata = this;
tmi.position = iChooserMenuPos++;
- tmi.ptszName = m_tszUserName;
+ tmi.name.t = m_tszUserName;
m_hChooseMenuItem = (HGENMENU)CallService(MO_ADDNEWMENUITEM, (WPARAM)hChooserMenu, (LPARAM)&tmi);
//////////////////////////////////////////////////////////////////////////////////////
|