diff options
Diffstat (limited to 'protocols/MSN/src')
| -rw-r--r-- | protocols/MSN/src/msn_global.h | 2 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_menu.cpp | 10 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_proto.cpp | 40 |
3 files changed, 26 insertions, 26 deletions
diff --git a/protocols/MSN/src/msn_global.h b/protocols/MSN/src/msn_global.h index 33dc271cfc..99b4448964 100644 --- a/protocols/MSN/src/msn_global.h +++ b/protocols/MSN/src/msn_global.h @@ -65,6 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <m_avatars.h>
#include <m_timezones.h>
#include <m_extraicons.h>
+#include <m_nudge.h>
#include "m_proto_listeningto.h"
#include "m_folders.h"
@@ -135,7 +136,6 @@ const char MSN_USER_AGENT[] = "Mozilla/4.0 (compatible; MSIE 8.0; Wind #define MSN_INVITE "/InviteCommand"
#define MSN_NETMEETING "/NetMeeting"
#define MSN_VIEW_PROFILE "/ViewProfile"
-#define MSN_SEND_NUDGE "/SendNudge"
#define MS_GOTO_INBOX "/GotoInbox"
#define MS_EDIT_PROFILE "/EditProfile"
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 001efbb89a..f8f56c334a 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -307,35 +307,35 @@ void CMsnProto::MsnInitMainMenu(void) mi.pszService = servicefunction;
strcpy(tDest, MS_SET_NICKNAME_UI);
- CreateService(MS_SET_NICKNAME_UI, &CMsnProto::SetNicknameUI);
+ CreateProtoService(MS_SET_NICKNAME_UI, &CMsnProto::SetNicknameUI);
mi.position = 201001;
mi.icolibItem = GetIconHandle(IDI_MSN);
mi.pszName = LPGEN("Set &Nickname");
menuItemsMain[0] = Menu_AddProtoMenuItem(&mi);
strcpy(tDest, MSN_INVITE);
- CreateService(MSN_INVITE, &CMsnProto::MsnInviteCommand);
+ CreateProtoService(MSN_INVITE, &CMsnProto::MsnInviteCommand);
mi.position = 201002;
mi.icolibItem = GetIconHandle(IDI_INVITE);
mi.pszName = LPGEN("Create &Chat");
menuItemsMain[0] = Menu_AddProtoMenuItem(&mi);
strcpy(tDest, MS_GOTO_INBOX);
- CreateService(MS_GOTO_INBOX, &CMsnProto::MsnGotoInbox);
+ CreateProtoService(MS_GOTO_INBOX, &CMsnProto::MsnGotoInbox);
mi.position = 201003;
mi.icolibItem = GetIconHandle(IDI_INBOX);
mi.pszName = LPGEN("Display &Hotmail Inbox");
menuItemsMain[1] = Menu_AddProtoMenuItem(&mi);
strcpy(tDest, MS_EDIT_PROFILE);
- CreateService(MS_EDIT_PROFILE, &CMsnProto::MsnEditProfile);
+ CreateProtoService(MS_EDIT_PROFILE, &CMsnProto::MsnEditProfile);
mi.position = 201004;
mi.icolibItem = GetIconHandle(IDI_PROFILE);
mi.pszName = LPGEN("View &Profile");
menuItemsMain[2] = Menu_AddProtoMenuItem(&mi);
strcpy(tDest, MS_EDIT_ALERTS);
- CreateService(MS_EDIT_ALERTS, &CMsnProto::MsnSetupAlerts);
+ CreateProtoService(MS_EDIT_ALERTS, &CMsnProto::MsnSetupAlerts);
mi.position = 201004;
mi.icolibItem = GetIconHandle(IDI_PROFILE);
mi.pszName = LPGEN("Setup Live &Alerts");
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 9e8390c03e..6ea0c131b7 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -51,32 +51,32 @@ CMsnProto::CMsnProto(const char* aProtoName, const TCHAR* aUserName) : db_set_resident(m_szModuleName, "MobileAllowed");
// Protocol services and events...
- hMSNNudge = CreateHookableEvent("/Nudge");
+ hMSNNudge = CreateProtoEvent("/Nudge");
- CreateService(PS_CREATEACCMGRUI, &CMsnProto::SvcCreateAccMgrUI);
+ CreateProtoService(PS_CREATEACCMGRUI, &CMsnProto::SvcCreateAccMgrUI);
- CreateService(PS_GETAVATARINFOT, &CMsnProto::GetAvatarInfo);
- CreateService(PS_GETMYAWAYMSG, &CMsnProto::GetMyAwayMsg);
+ CreateProtoService(PS_GETAVATARINFOT, &CMsnProto::GetAvatarInfo);
+ CreateProtoService(PS_GETMYAWAYMSG, &CMsnProto::GetMyAwayMsg);
- CreateService(PS_LEAVECHAT, &CMsnProto::OnLeaveChat);
+ CreateProtoService(PS_LEAVECHAT, &CMsnProto::OnLeaveChat);
- CreateService(PS_GETMYAVATART, &CMsnProto::GetAvatar);
- CreateService(PS_SETMYAVATART, &CMsnProto::SetAvatar);
- CreateService(PS_GETAVATARCAPS, &CMsnProto::GetAvatarCaps);
+ CreateProtoService(PS_GETMYAVATART, &CMsnProto::GetAvatar);
+ CreateProtoService(PS_SETMYAVATART, &CMsnProto::SetAvatar);
+ CreateProtoService(PS_GETAVATARCAPS, &CMsnProto::GetAvatarCaps);
- CreateService(PS_GET_LISTENINGTO, &CMsnProto::GetCurrentMedia);
- CreateService(PS_SET_LISTENINGTO, &CMsnProto::SetCurrentMedia);
+ CreateProtoService(PS_GET_LISTENINGTO, &CMsnProto::GetCurrentMedia);
+ CreateProtoService(PS_SET_LISTENINGTO, &CMsnProto::SetCurrentMedia);
- CreateService(PS_SETMYNICKNAME, &CMsnProto::SetNickName);
- CreateService(MSN_SEND_NUDGE, &CMsnProto::SendNudge);
+ CreateProtoService(PS_SETMYNICKNAME, &CMsnProto::SetNickName);
+ CreateProtoService(PS_SEND_NUDGE, &CMsnProto::SendNudge);
- CreateService(MSN_GETUNREAD_EMAILCOUNT, &CMsnProto::GetUnreadEmailCount);
+ CreateProtoService(MSN_GETUNREAD_EMAILCOUNT, &CMsnProto::GetUnreadEmailCount);
// event hooks
- HookEvent(ME_MSG_WINDOWPOPUP, &CMsnProto::OnWindowPopup);
- HookEvent(ME_CLIST_GROUPCHANGE, &CMsnProto::OnGroupChange);
- HookEvent(ME_OPT_INITIALISE, &CMsnProto::OnOptionsInit);
- HookEvent(ME_CLIST_DOUBLECLICKED, &CMsnProto::OnContactDoubleClicked);
+ HookProtoEvent(ME_MSG_WINDOWPOPUP, &CMsnProto::OnWindowPopup);
+ HookProtoEvent(ME_CLIST_GROUPCHANGE, &CMsnProto::OnGroupChange);
+ HookProtoEvent(ME_OPT_INITIALISE, &CMsnProto::OnOptionsInit);
+ HookProtoEvent(ME_CLIST_DOUBLECLICKED, &CMsnProto::OnContactDoubleClicked);
LoadOptions();
@@ -192,11 +192,11 @@ int CMsnProto::OnModulesLoaded(WPARAM, LPARAM) gcr.pszModule = m_szModuleName;
CallServiceSync(MS_GC_REGISTER, 0, (LPARAM)&gcr);
- HookEvent(ME_GC_EVENT, &CMsnProto::MSN_GCEventHook);
- HookEvent(ME_GC_BUILDMENU, &CMsnProto::MSN_GCMenuHook);
+ HookProtoEvent(ME_GC_EVENT, &CMsnProto::MSN_GCEventHook);
+ HookProtoEvent(ME_GC_BUILDMENU, &CMsnProto::MSN_GCMenuHook);
}
- HookEvent(ME_IDLE_CHANGED, &CMsnProto::OnIdleChanged);
+ HookProtoEvent(ME_IDLE_CHANGED, &CMsnProto::OnIdleChanged);
InitPopups();
return 0;
}
|