From 59cd198e89782263777c57dcd54704ecb1e10212 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 28 Jun 2015 17:41:48 +0000 Subject: finally CLISTEVENT removed completely git-svn-id: http://svn.miranda-ng.org/main/trunk@14430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/gg.cpp | 14 +++++++------- protocols/Gadu-Gadu/src/groupchat.cpp | 8 ++++---- protocols/Gadu-Gadu/src/image.cpp | 4 ++-- protocols/Gadu-Gadu/src/import.cpp | 14 +++++++------- protocols/Gadu-Gadu/src/sessions.cpp | 6 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'protocols/Gadu-Gadu/src') diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 0e8d5463b0..3c496a0263 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -235,9 +235,9 @@ INT_PTR GGPROTO::blockuser(WPARAM hContact, LPARAM lParam) #define GGS_BLOCKUSER "/BlockUser" void GGPROTO::block_init() { - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.position = -500050000; - mi.icolibItem = iconList[8].hIcolib; + mi.hIcolibItem = iconList[8].hIcolib; mi.name.a = LPGEN("&Block"); mi.pszService = GGS_BLOCKUSER; hBlockMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName); @@ -257,28 +257,28 @@ void GGPROTO::block_uninit() // Menus initialization void GGPROTO::menus_init() { - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; HGENMENU hGCRoot, hCLRoot, hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { mi.name.t = m_tszUserName; mi.position = 500090000; mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; - mi.icolibItem = iconList[0].hIcolib; + mi.hIcolibItem = iconList[0].hIcolib; hGCRoot = hCLRoot = hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi); } else { - mi.hParentMenu = hRoot; + mi.root = hRoot; mi.flags = CMIF_TCHAR; mi.name.t = LPGENT("Conference"); mi.position = 200001; - mi.icolibItem = iconList[14].hIcolib; + mi.hIcolibItem = iconList[14].hIcolib; hGCRoot = Menu_AddProtoMenuItem(&mi, m_szModuleName); mi.name.t = LPGENT("Contact list"); mi.position = 200002; - mi.icolibItem = iconList[7].hIcolib; + mi.hIcolibItem = iconList[7].hIcolib; hCLRoot = Menu_AddProtoMenuItem(&mi, m_szModuleName); if (hMenuRoot) diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 61e1318022..5f1b0ec623 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -57,15 +57,15 @@ int GGPROTO::gc_init() void GGPROTO::gc_menus_init(HGENMENU hRoot) { if (gc_enabled) { - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.flags = CMIF_TCHAR; - mi.hParentMenu = hRoot; + mi.root = hRoot; // Conferencing mi.pszService = GGS_OPEN_CONF; CreateProtoService(mi.pszService, &GGPROTO::gc_openconf); mi.position = 2000050001; - mi.icolibItem = iconList[14].hIcolib; + mi.hIcolibItem = iconList[14].hIcolib; mi.name.t = LPGENT("Open &conference..."); hMainMenu[0] = Menu_AddProtoMenuItem(&mi, m_szModuleName); @@ -73,7 +73,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot) mi.pszService = GGS_CLEAR_IGNORED; CreateProtoService(mi.pszService, &GGPROTO::gc_clearignored); mi.position = 2000050002; - mi.icolibItem = iconList[15].hIcolib; + mi.hIcolibItem = iconList[15].hIcolib; mi.name.t = LPGENT("&Clear ignored conferences"); hMainMenu[1] = Menu_AddProtoMenuItem(&mi, m_szModuleName); } diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 6591861af4..860cc2f965 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -69,9 +69,9 @@ int gg_img_remove(GGIMAGEDLGDATA *dat); int GGPROTO::img_init() { // Send image contact menu item - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.position = -2000010000; - mi.icolibItem = iconList[11].hIcolib; + mi.hIcolibItem = iconList[11].hIcolib; mi.name.a = LPGEN("&Image"); mi.pszService = GGS_SENDIMAGE; hImageMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName); diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index 7a4cea35cd..c44e098383 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -514,15 +514,15 @@ INT_PTR GGPROTO::export_server(WPARAM wParam, LPARAM lParam) void GGPROTO::import_init(HGENMENU hRoot) { - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.flags = CMIF_TCHAR; - mi.hParentMenu = hRoot; + mi.root = hRoot; // Import from server item mi.pszService = GGS_IMPORT_SERVER; CreateProtoService(mi.pszService, &GGPROTO::import_server); mi.position = 2000500001; - mi.icolibItem = iconList[1].hIcolib; + mi.hIcolibItem = iconList[1].hIcolib; mi.name.t = LPGENT("Import List From &Server"); hMainMenu[2] = Menu_AddProtoMenuItem(&mi, m_szModuleName); @@ -530,7 +530,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.pszService = GGS_IMPORT_TEXT; CreateProtoService(mi.pszService, &GGPROTO::import_text); mi.position = 2000500002; - mi.icolibItem = iconList[2].hIcolib; + mi.hIcolibItem = iconList[2].hIcolib; mi.name.t = LPGENT("Import List From &Text File..."); hMainMenu[3] = Menu_AddProtoMenuItem(&mi, m_szModuleName); @@ -538,7 +538,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.pszService = GGS_REMOVE_SERVER; CreateProtoService(mi.pszService, &GGPROTO::remove_server); mi.position = 2000500003; - mi.icolibItem = iconList[3].hIcolib; + mi.hIcolibItem = iconList[3].hIcolib; mi.name.t = LPGENT("&Remove List From Server"); hMainMenu[4] = Menu_AddProtoMenuItem(&mi, m_szModuleName); @@ -546,7 +546,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.pszService = GGS_EXPORT_SERVER; CreateProtoService(mi.pszService, &GGPROTO::export_server); mi.position = 2005000001; - mi.icolibItem = iconList[4].hIcolib; + mi.hIcolibItem = iconList[4].hIcolib; mi.name.t = LPGENT("Export List To &Server"); hMainMenu[5] = Menu_AddProtoMenuItem(&mi, m_szModuleName); @@ -554,7 +554,7 @@ void GGPROTO::import_init(HGENMENU hRoot) mi.pszService = GGS_EXPORT_TEXT; CreateProtoService(mi.pszService, &GGPROTO::export_text); mi.position = 2005000002; - mi.icolibItem = iconList[5].hIcolib; + mi.hIcolibItem = iconList[5].hIcolib; mi.name.t = LPGENT("Export List To &Text File..."); hMainMenu[6] = Menu_AddProtoMenuItem(&mi, m_szModuleName); } diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index 4823849635..6364386820 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -416,14 +416,14 @@ BOOL GGPROTO::sessions_closedlg() void GGPROTO::sessions_menus_init(HGENMENU hRoot) { - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.flags = CMIF_TCHAR; - mi.hParentMenu = hRoot; + mi.root = hRoot; mi.pszService = GGS_CONCUR_SESS; CreateProtoService(mi.pszService, &GGPROTO::sessions_view); mi.position = (hMenuRoot) ? 2050000001 : 200003; - mi.icolibItem = iconList[16].hIcolib; + mi.hIcolibItem = iconList[16].hIcolib; mi.name.t = LPGENT("Concurrent &sessions"); Menu_AddProtoMenuItem(&mi, m_szModuleName); } -- cgit v1.2.3