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/AimOscar/src/chat.cpp | 4 ++-- protocols/AimOscar/src/proto.cpp | 28 ++++++++++++++-------------- protocols/AimOscar/src/theme.cpp | 14 +++++++------- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'protocols/AimOscar') diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp index 033643f915..1c9f329486 100644 --- a/protocols/AimOscar/src/chat.cpp +++ b/protocols/AimOscar/src/chat.cpp @@ -31,8 +31,8 @@ void CAimProto::chat_register(void) gcr.pszModule = m_szModuleName; CallServiceSync(MS_GC_REGISTER, 0, (LPARAM)&gcr); - HookEvent(ME_GC_EVENT, &CAimProto::OnGCEvent); - HookEvent(ME_GC_BUILDMENU, &CAimProto::OnGCMenuHook ); + HookProtoEvent(ME_GC_EVENT, &CAimProto::OnGCEvent); + HookProtoEvent(ME_GC_BUILDMENU, &CAimProto::OnGCMenuHook ); } void CAimProto::chat_start(const char* id, unsigned short exchange) diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp index e3821fed42..e8148a83c2 100644 --- a/protocols/AimOscar/src/proto.cpp +++ b/protocols/AimOscar/src/proto.cpp @@ -31,21 +31,21 @@ CAimProto::CAimProto(const char* aProtoName, const TCHAR* aUserName) : InitializeCriticalSection(&SendingMutex); InitializeCriticalSection(&connMutex); - CreateService(PS_CREATEACCMGRUI, &CAimProto::SvcCreateAccMgrUI); + CreateProtoService(PS_CREATEACCMGRUI, &CAimProto::SvcCreateAccMgrUI); - CreateService(PS_GETMYAWAYMSG, &CAimProto::GetMyAwayMsg); + CreateProtoService(PS_GETMYAWAYMSG, &CAimProto::GetMyAwayMsg); - CreateService(PS_GETAVATARINFOT, &CAimProto::GetAvatarInfo); - CreateService(PS_GETMYAVATART, &CAimProto::GetAvatar); - CreateService(PS_SETMYAVATART, &CAimProto::SetAvatar); - CreateService(PS_GETAVATARCAPS, &CAimProto::GetAvatarCaps); + CreateProtoService(PS_GETAVATARINFOT, &CAimProto::GetAvatarInfo); + CreateProtoService(PS_GETMYAVATART, &CAimProto::GetAvatar); + CreateProtoService(PS_SETMYAVATART, &CAimProto::SetAvatar); + CreateProtoService(PS_GETAVATARCAPS, &CAimProto::GetAvatarCaps); - CreateService(PS_JOINCHAT, &CAimProto::OnJoinChat); - CreateService(PS_LEAVECHAT, &CAimProto::OnLeaveChat); + CreateProtoService(PS_JOINCHAT, &CAimProto::OnJoinChat); + CreateProtoService(PS_LEAVECHAT, &CAimProto::OnLeaveChat); - HookEvent(ME_CLIST_PREBUILDCONTACTMENU, &CAimProto::OnPreBuildContactMenu); - HookEvent(ME_CLIST_GROUPCHANGE, &CAimProto::OnGroupChange); - HookEvent(ME_OPT_INITIALISE, &CAimProto::OnOptionsInit); + HookProtoEvent(ME_CLIST_PREBUILDCONTACTMENU, &CAimProto::OnPreBuildContactMenu); + HookProtoEvent(ME_CLIST_GROUPCHANGE, &CAimProto::OnGroupChange); + HookProtoEvent(ME_OPT_INITIALISE, &CAimProto::OnOptionsInit); init_custom_folders(); offline_contacts(); @@ -116,9 +116,9 @@ CAimProto::~CAimProto() int CAimProto::OnModulesLoaded(WPARAM wParam, LPARAM lParam) { - HookEvent(ME_USERINFO_INITIALISE, &CAimProto::OnUserInfoInit); - HookEvent(ME_IDLE_CHANGED, &CAimProto::OnIdleChanged); - HookEvent(ME_MSG_WINDOWEVENT, &CAimProto::OnWindowEvent); + HookProtoEvent(ME_USERINFO_INITIALISE, &CAimProto::OnUserInfoInit); + HookProtoEvent(ME_IDLE_CHANGED, &CAimProto::OnIdleChanged); + HookProtoEvent(ME_MSG_WINDOWEVENT, &CAimProto::OnWindowEvent); chat_register(); InitContactMenus(); diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp index 495ac46299..14a97d7f81 100644 --- a/protocols/AimOscar/src/theme.cpp +++ b/protocols/AimOscar/src/theme.cpp @@ -270,21 +270,21 @@ void CAimProto::InitMainMenus(void) mi.flags = CMIF_CHILDPOPUP; mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/ManageAccount"); - CreateService("/ManageAccount", &CAimProto::ManageAccount); + CreateProtoService("/ManageAccount", &CAimProto::ManageAccount); mi.position = 201001; mi.icolibItem = GetIconHandle("aim"); mi.pszName = LPGEN("Manage Account"); hMainMenu[0] = Menu_AddProtoMenuItem(&mi); mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/InstantIdle"); - CreateService("/InstantIdle",&CAimProto::InstantIdle); + CreateProtoService("/InstantIdle",&CAimProto::InstantIdle); mi.position = 201002; mi.icolibItem = GetIconHandle("idle"); mi.pszName = LPGEN("Instant Idle"); hMainMenu[1] = Menu_AddProtoMenuItem(&mi); mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/JoinChatRoom"); - CreateService("/JoinChatRoom", &CAimProto::JoinChatUI); + CreateProtoService("/JoinChatRoom", &CAimProto::JoinChatUI); mi.position = 201003; mi.icolibItem = GetIconHandle("aol"); mi.pszName = LPGEN( "Join Chat Room" ); @@ -301,7 +301,7 @@ void CAimProto::InitContactMenus(void) mi.pszContactOwner = m_szModuleName; mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/GetHTMLAwayMsg"); - CreateService("/GetHTMLAwayMsg",&CAimProto::GetHTMLAwayMsg); + CreateProtoService("/GetHTMLAwayMsg",&CAimProto::GetHTMLAwayMsg); mi.position = -2000006000; mi.icolibItem = GetIconHandle("away"); mi.pszName = LPGEN("Read &HTML Away Message"); @@ -309,7 +309,7 @@ void CAimProto::InitContactMenus(void) hHTMLAwayContextMenuItem = Menu_AddContactMenuItem(&mi); mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/GetProfile"); - CreateService("/GetProfile", &CAimProto::GetProfile); + CreateProtoService("/GetProfile", &CAimProto::GetProfile); mi.position = -2000005090; mi.icolibItem = GetIconHandle("profile"); mi.pszName = LPGEN("Read Profile"); @@ -317,7 +317,7 @@ void CAimProto::InitContactMenus(void) hReadProfileMenuItem = Menu_AddContactMenuItem(&mi); mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/AddToServerList"); - CreateService("/AddToServerList", &CAimProto::AddToServerList); + CreateProtoService("/AddToServerList", &CAimProto::AddToServerList); mi.position = -2000005080; mi.icolibItem = GetIconHandle("add"); mi.pszName = LPGEN("Add To Server List"); @@ -325,7 +325,7 @@ void CAimProto::InitContactMenus(void) hAddToServerListContextMenuItem = Menu_AddContactMenuItem(&mi); mir_snprintf(service_name, sizeof(service_name), "%s%s", m_szModuleName, "/BlockCommand"); - CreateService("/BlockCommand", &CAimProto::BlockBuddy); + CreateProtoService("/BlockCommand", &CAimProto::BlockBuddy); mi.position = -2000005060; mi.icolibItem = GetIconHandle("block"); mi.pszName = LPGEN("&Block"); -- cgit v1.2.3