diff options
| -rw-r--r-- | protocols/MRA/src/MraProto.cpp | 6 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_proto.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/meta_services.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 3329a31aa0..5988573c33 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -32,8 +32,7 @@ CMraProto::CMraProto(const char* _module, const wchar_t* _displayName) : CreateProtoService(PS_SEND_NUDGE, &CMraProto::MraSendNudge);
CreateProtoService(PS_GETUNREADEMAILCOUNT, &CMraProto::GetUnreadEmailCount);
- if (ServiceExists(MS_NUDGE_SEND))
- m_heNudgeReceived = CreateProtoEvent(PE_NUDGE);
+ m_heNudgeReceived = CreateProtoEvent(PE_NUDGE);
wchar_t name[MAX_PATH];
mir_snwprintf(name, TranslateT("%s connection"), m_tszUserName);
@@ -64,8 +63,7 @@ CMraProto::~CMraProto() {
Netlib_CloseHandle(m_hNetlibUser);
- if (m_heNudgeReceived)
- DestroyHookableEvent(m_heNudgeReceived);
+ DestroyHookableEvent(m_heNudgeReceived);
MraAvatarsQueueDestroy(hAvatarsQueueHandle);
MraMPopSessionQueueDestroy(hMPopSessionQueue);
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 3b307b07a6..567facc9e4 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -75,7 +75,7 @@ CMsnProto::CMsnProto(const char* aProtoName, const wchar_t* aUserName) : CreateProtoService(PS_SETMYNICKNAME, &CMsnProto::SetNickName);
- hMSNNudge = CreateProtoEvent("/Nudge");
+ hMSNNudge = CreateProtoEvent(PE_NUDGE);
CreateProtoService(PS_SEND_NUDGE, &CMsnProto::SendNudge);
CreateProtoService(PS_GETUNREADEMAILCOUNT, &CMsnProto::GetUnreadEmailCount);
diff --git a/src/mir_app/src/meta_services.cpp b/src/mir_app/src/meta_services.cpp index e6bd05338a..4a67acce15 100644 --- a/src/mir_app/src/meta_services.cpp +++ b/src/mir_app/src/meta_services.cpp @@ -899,7 +899,7 @@ void Meta_InitServices() HookEvent(ME_MC_DEFAULTTCHANGED, Meta_CallMostOnline);
// redirect nudge events
- hEventNudge = CreateHookableEvent(META_PROTO "/Nudge");
+ hEventNudge = CreateHookableEvent(META_PROTO PE_NUDGE);
}
/////////////////////////////////////////////////////////////////////////////////////////
|