summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-07-16 17:30:15 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-07-16 17:30:15 +0300
commit1d002790ba625d5af4e1932ad95710203e5b6e9c (patch)
treeca02d8fbb0cb388fd18e8b59fa22f3ee93f24178 /protocols
parentb1c5a5361b700745faf23bea8ecd94a45d74961d (diff)
code cleaning related to Nudge plugin
Diffstat (limited to 'protocols')
-rw-r--r--protocols/MRA/src/MraProto.cpp6
-rw-r--r--protocols/MSN/src/msn_proto.cpp2
2 files changed, 3 insertions, 5 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);