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/Tlen/src/jabber.h | 1 + protocols/Tlen/src/jabber_svc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'protocols/Tlen/src') diff --git a/protocols/Tlen/src/jabber.h b/protocols/Tlen/src/jabber.h index 7727eb799b..c62d1110e5 100644 --- a/protocols/Tlen/src/jabber.h +++ b/protocols/Tlen/src/jabber.h @@ -81,6 +81,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include #include "jabber_xml.h" #include "crypto/polarssl/aes.h" diff --git a/protocols/Tlen/src/jabber_svc.cpp b/protocols/Tlen/src/jabber_svc.cpp index 46ef0b78b5..43886efe9a 100644 --- a/protocols/Tlen/src/jabber_svc.cpp +++ b/protocols/Tlen/src/jabber_svc.cpp @@ -1243,7 +1243,7 @@ void TlenInitServicesVTbl(TlenProtocol *proto) { sprintf(s, "%s%s", proto->m_szModuleName, PS_GETAVATARINFO); CreateServiceFunction_Ex(s, proto, TlenGetAvatarInfo); - sprintf(s, "%s%s", proto->m_szModuleName, "/SendNudge"); + sprintf(s, "%s%s", proto->m_szModuleName, PS_SEND_NUDGE); CreateServiceFunction_Ex(s, proto, TlenSendAlert); sprintf(s, "%s%s", proto->m_szModuleName, PS_GETAVATARCAPS); @@ -1273,7 +1273,7 @@ TlenProtocol::TlenProtocol( const char *aProtoName, const TCHAR *aUserName) : char text[_MAX_PATH]; sprintf(text, "%s/%s", m_szModuleName, "Nudge"); - hTlenNudge = CreateHookableEvent(text); + hTlenNudge = CreateProtoEvent(text); HookEventObj_Ex(ME_SYSTEM_MODULESLOADED, this, TlenSystemModulesLoaded); HookEventObj_Ex(ME_OPT_INITIALISE, this, TlenOptionsInit); -- cgit v1.2.3