From 90c2f2a24e911c832e11fcc6443afd24efdd4cc9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 28 Jul 2013 11:05:10 +0000 Subject: - fix for name conflict in proto helpers; - switch to constants defined in m_nudge.h git-svn-id: http://svn.miranda-ng.org/main/trunk@5504 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/gg.cpp | 2 +- protocols/Gadu-Gadu/src/gg_proto.cpp | 20 ++++++++++---------- protocols/Gadu-Gadu/src/groupchat.cpp | 6 +++--- protocols/Gadu-Gadu/src/image.cpp | 4 ++-- protocols/Gadu-Gadu/src/import.cpp | 10 +++++----- protocols/Gadu-Gadu/src/sessions.cpp | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'protocols/Gadu-Gadu/src') diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 836384139c..e10057af73 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -260,7 +260,7 @@ void GGPROTO::block_init() { char service[64]; mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_BLOCKUSER); - CreateService(GGS_BLOCKUSER, &GGPROTO::blockuser); + CreateProtoService(GGS_BLOCKUSER, &GGPROTO::blockuser); CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIF_TCHAR; diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index 137c4bb1ef..f87c8451c5 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -51,16 +51,16 @@ GGPROTO::GGPROTO(const char* pszProtoName, const TCHAR* tszUserName) : netlib = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu); // Register services - CreateService(PS_GETAVATARCAPS, &GGPROTO::getavatarcaps); - CreateService(PS_GETAVATARINFOT, &GGPROTO::getavatarinfo); - CreateService(PS_GETMYAVATART, &GGPROTO::getmyavatar); - CreateService(PS_SETMYAVATART, &GGPROTO::setmyavatar); + CreateProtoService(PS_GETAVATARCAPS, &GGPROTO::getavatarcaps); + CreateProtoService(PS_GETAVATARINFOT, &GGPROTO::getavatarinfo); + CreateProtoService(PS_GETMYAVATART, &GGPROTO::getmyavatar); + CreateProtoService(PS_SETMYAVATART, &GGPROTO::setmyavatar); - CreateService(PS_GETMYAWAYMSG, &GGPROTO::getmyawaymsg); - CreateService(PS_SETAWAYMSGT, (MyServiceFunc)&GGPROTO::SetAwayMsg); - CreateService(PS_CREATEACCMGRUI, &GGPROTO::get_acc_mgr_gui); + CreateProtoService(PS_GETMYAWAYMSG, &GGPROTO::getmyawaymsg); + CreateProtoService(PS_SETAWAYMSGT, (MyServiceFunc)&GGPROTO::SetAwayMsg); + CreateProtoService(PS_CREATEACCMGRUI, &GGPROTO::get_acc_mgr_gui); - CreateService(PS_LEAVECHAT, &GGPROTO::leavechat); + CreateProtoService(PS_LEAVECHAT, &GGPROTO::leavechat); // Offline contacts and clear logon time setalloffline(); @@ -792,8 +792,8 @@ int GGPROTO::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) switch( eventType ) { case EV_PROTO_ONLOAD: { - HookEvent(ME_OPT_INITIALISE, &GGPROTO::options_init); - HookEvent(ME_USERINFO_INITIALISE, &GGPROTO::details_init); + HookProtoEvent(ME_OPT_INITIALISE, &GGPROTO::options_init); + HookProtoEvent(ME_USERINFO_INITIALISE, &GGPROTO::details_init); // Init misc stuff gg_icolib_init(); diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 418be65df1..4c9354ec61 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -44,7 +44,7 @@ int GGPROTO::gc_init() gcr.ptszModuleDispName = m_tszUserName; gcr.pszModule = m_szModuleName; CallServiceSync(MS_GC_REGISTER, 0, (LPARAM)&gcr); - HookEvent(ME_GC_EVENT, &GGPROTO::gc_event); + HookProtoEvent(ME_GC_EVENT, &GGPROTO::gc_event); gc_enabled = TRUE; // create & hook event mir_snprintf(service, 64, GG_GC_GETCHAT, m_szModuleName); @@ -70,7 +70,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot) // Conferencing mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_OPEN_CONF); - CreateService(GGS_OPEN_CONF, &GGPROTO::gc_openconf); + CreateProtoService(GGS_OPEN_CONF, &GGPROTO::gc_openconf); mi.position = 2000050001; mi.icolibItem = iconList[14].hIcolib; mi.ptszName = LPGENT("Open &conference..."); @@ -79,7 +79,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot) // Clear ignored conferences mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_CLEAR_IGNORED); - CreateService(GGS_CLEAR_IGNORED, &GGPROTO::gc_clearignored); + CreateProtoService(GGS_CLEAR_IGNORED, &GGPROTO::gc_clearignored); mi.position = 2000050002; mi.icolibItem = iconList[15].hIcolib; mi.ptszName = LPGENT("&Clear ignored conferences"); diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 8df70b2cfc..4a86881d19 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -70,7 +70,7 @@ int GGPROTO::img_init() { char service[64]; mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_SENDIMAGE); - CreateService(GGS_SENDIMAGE, &GGPROTO::img_sendimg); + CreateProtoService(GGS_SENDIMAGE, &GGPROTO::img_sendimg); // Send image contact menu item CLISTMENUITEM mi = { sizeof(mi) }; @@ -83,7 +83,7 @@ int GGPROTO::img_init() hImageMenuItem = Menu_AddContactMenuItem(&mi); // Receive image - CreateService(GGS_RECVIMAGE, &GGPROTO::img_recvimage); + CreateProtoService(GGS_RECVIMAGE, &GGPROTO::img_recvimage); return FALSE; } diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index d19d5abaea..11cf777cd9 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -613,7 +613,7 @@ void GGPROTO::import_init(HGENMENU hRoot) // Import from server item char service[64]; mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_IMPORT_SERVER); - CreateService(GGS_IMPORT_SERVER, &GGPROTO::import_server); + CreateProtoService(GGS_IMPORT_SERVER, &GGPROTO::import_server); CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR; @@ -626,7 +626,7 @@ void GGPROTO::import_init(HGENMENU hRoot) // Import from textfile mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_IMPORT_TEXT); - CreateService(GGS_IMPORT_TEXT, &GGPROTO::import_text); + CreateProtoService(GGS_IMPORT_TEXT, &GGPROTO::import_text); mi.position = 2000500002; mi.icolibItem = iconList[2].hIcolib; @@ -636,7 +636,7 @@ void GGPROTO::import_init(HGENMENU hRoot) // Remove from server mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_REMOVE_SERVER); - CreateService(GGS_REMOVE_SERVER, &GGPROTO::remove_server); + CreateProtoService(GGS_REMOVE_SERVER, &GGPROTO::remove_server); mi.position = 2000500003; mi.icolibItem = iconList[3].hIcolib; @@ -646,7 +646,7 @@ void GGPROTO::import_init(HGENMENU hRoot) // Export to server mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_EXPORT_SERVER); - CreateService(GGS_EXPORT_SERVER, &GGPROTO::export_server); + CreateProtoService(GGS_EXPORT_SERVER, &GGPROTO::export_server); mi.position = 2005000001; mi.icolibItem = iconList[4].hIcolib; @@ -656,7 +656,7 @@ void GGPROTO::import_init(HGENMENU hRoot) // Export to textfile mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_EXPORT_TEXT); - CreateService(GGS_EXPORT_TEXT, &GGPROTO::export_text); + CreateProtoService(GGS_EXPORT_TEXT, &GGPROTO::export_text); mi.position = 2005000002; mi.icolibItem = iconList[5].hIcolib; diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index 7268d9fafc..a49500a567 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -427,7 +427,7 @@ void GGPROTO::sessions_menus_init(HGENMENU hRoot) { char service[64]; mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_CONCUR_SESS); - CreateService(service, &GGPROTO::sessions_view); + CreateProtoService(service, &GGPROTO::sessions_view); CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR; -- cgit v1.2.3