From ab4abbb7a60f941acab8f0566c6b619f68f1b489 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 27 Jun 2015 11:09:19 +0000 Subject: - CLISTMENUITEM::pszContactOwner removed, because it's supported only by contact's menu; - Menu_AddContactMenuItem now receives parameter szProto; - Menu_Add* helpers are converted into real functions; git-svn-id: http://svn.miranda-ng.org/main/trunk@14409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/gg.cpp | 18 ++++++------------ protocols/Gadu-Gadu/src/groupchat.cpp | 4 ++-- protocols/Gadu-Gadu/src/image.cpp | 12 +++--------- protocols/Gadu-Gadu/src/import.cpp | 10 +++++----- protocols/Gadu-Gadu/src/sessions.cpp | 2 +- 5 files changed, 17 insertions(+), 29 deletions(-) (limited to 'protocols/Gadu-Gadu/src') diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 7a7a6dd8d6..95b23cc877 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -235,18 +235,12 @@ INT_PTR GGPROTO::blockuser(WPARAM hContact, LPARAM lParam) #define GGS_BLOCKUSER "/BlockUser" void GGPROTO::block_init() { - char service[64]; - mir_snprintf(service, _countof(service), "%s%s", m_szModuleName, GGS_BLOCKUSER); - CreateProtoService(GGS_BLOCKUSER, &GGPROTO::blockuser); - CLISTMENUITEM mi = { 0 }; - mi.flags = CMIF_TCHAR; mi.position = -500050000; mi.icolibItem = iconList[8].hIcolib; - mi.ptszName = LPGENT("&Block"); - mi.pszService = service; - mi.pszContactOwner = m_szModuleName; - hBlockMenuItem = Menu_AddContactMenuItem(&mi); + mi.name.a = LPGEN("&Block"); + mi.pszService = GGS_BLOCKUSER; + hBlockMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName); ::HookEvent(ME_CLIST_PREBUILDCONTACTMENU, gg_prebuildcontactmenu); } @@ -267,7 +261,7 @@ void GGPROTO::menus_init() HGENMENU hGCRoot, hCLRoot, hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { - mi.ptszName = m_tszUserName; + mi.name.t = m_tszUserName; mi.position = 500090000; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.icolibItem = iconList[0].hIcolib; @@ -277,12 +271,12 @@ void GGPROTO::menus_init() mi.hParentMenu = hRoot; mi.flags = CMIF_TCHAR; - mi.ptszName = LPGENT("Conference"); + mi.name.t = LPGENT("Conference"); mi.position = 200001; mi.icolibItem = iconList[14].hIcolib; hGCRoot = Menu_AddProtoMenuItem(&mi); - mi.ptszName = LPGENT("Contact list"); + mi.name.t = LPGENT("Contact list"); mi.position = 200002; mi.icolibItem = iconList[7].hIcolib; hCLRoot = Menu_AddProtoMenuItem(&mi); diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 76f99f114f..abecfa9c4a 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -68,7 +68,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot) CreateProtoService(GGS_OPEN_CONF, &GGPROTO::gc_openconf); mi.position = 2000050001; mi.icolibItem = iconList[14].hIcolib; - mi.ptszName = LPGENT("Open &conference..."); + mi.name.t = LPGENT("Open &conference..."); mi.pszService = service; hMainMenu[0] = Menu_AddProtoMenuItem(&mi); @@ -77,7 +77,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot) CreateProtoService(GGS_CLEAR_IGNORED, &GGPROTO::gc_clearignored); mi.position = 2000050002; mi.icolibItem = iconList[15].hIcolib; - mi.ptszName = LPGENT("&Clear ignored conferences"); + mi.name.t = LPGENT("&Clear ignored conferences"); mi.pszService = service; hMainMenu[1] = Menu_AddProtoMenuItem(&mi); } diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 753bf9b454..6591861af4 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -68,19 +68,13 @@ int gg_img_remove(GGIMAGEDLGDATA *dat); int GGPROTO::img_init() { - char service[64]; - mir_snprintf(service, _countof(service), "%s%s", m_szModuleName, GGS_SENDIMAGE); - CreateProtoService(GGS_SENDIMAGE, &GGPROTO::img_sendimg); - // Send image contact menu item CLISTMENUITEM mi = { 0 }; - mi.flags = CMIF_TCHAR; mi.position = -2000010000; mi.icolibItem = iconList[11].hIcolib; - mi.ptszName = LPGENT("&Image"); - mi.pszService = service; - mi.pszContactOwner = m_szModuleName; - hImageMenuItem = Menu_AddContactMenuItem(&mi); + mi.name.a = LPGEN("&Image"); + mi.pszService = GGS_SENDIMAGE; + hImageMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName); // Receive image CreateProtoService(GGS_RECVIMAGE, &GGPROTO::img_recvimage); diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index b9c925d1d4..1c8b286dee 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -524,7 +524,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.hParentMenu = hRoot; mi.position = 2000500001; mi.icolibItem = iconList[1].hIcolib; - mi.ptszName = LPGENT("Import List From &Server"); + mi.name.t = LPGENT("Import List From &Server"); mi.pszService = service; hMainMenu[2] = Menu_AddProtoMenuItem(&mi); @@ -534,7 +534,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.position = 2000500002; mi.icolibItem = iconList[2].hIcolib; - mi.ptszName = LPGENT("Import List From &Text File..."); + mi.name.t = LPGENT("Import List From &Text File..."); mi.pszService = service; hMainMenu[3] = Menu_AddProtoMenuItem(&mi); @@ -544,7 +544,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.position = 2000500003; mi.icolibItem = iconList[3].hIcolib; - mi.ptszName = LPGENT("&Remove List From Server"); + mi.name.t = LPGENT("&Remove List From Server"); mi.pszService = service; hMainMenu[4] = Menu_AddProtoMenuItem(&mi); @@ -554,7 +554,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.position = 2005000001; mi.icolibItem = iconList[4].hIcolib; - mi.ptszName = LPGENT("Export List To &Server"); + mi.name.t = LPGENT("Export List To &Server"); mi.pszService = service; hMainMenu[5] = Menu_AddProtoMenuItem(&mi); @@ -564,7 +564,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.position = 2005000002; mi.icolibItem = iconList[5].hIcolib; - mi.ptszName = LPGENT("Export List To &Text File..."); + mi.name.t = LPGENT("Export List To &Text File..."); mi.pszService = service; hMainMenu[6] = Menu_AddProtoMenuItem(&mi); } diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index 1b19989681..748c8751de 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -425,7 +425,7 @@ void GGPROTO::sessions_menus_init(HGENMENU hRoot) mi.hParentMenu = hRoot; mi.position = (hMenuRoot) ? 2050000001 : 200003; mi.icolibItem = iconList[16].hIcolib; - mi.ptszName = LPGENT("Concurrent &sessions"); + mi.name.t = LPGENT("Concurrent &sessions"); mi.pszService = service; Menu_AddProtoMenuItem(&mi); } -- cgit v1.2.3