- 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

5 files changed, 18 insertions, 18 deletions

diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp
index 57339feb7e..67b2f71d57 100644
--- a/protocols/Skype/src/skype_chat.cpp
+++ b/protocols/Skype/src/skype_chat.cpp
@@ -89,8 +89,8 @@ void CSkypeProto::InitChatModule()
 	gcr.pszModule = this->m_szModuleName;

 	::CallServiceSync(MS_GC_REGISTER, 0, (LPARAM)&gcr);

 

-	this->HookEvent(ME_GC_EVENT, &CSkypeProto::OnGCEventHook);

-	this->HookEvent(ME_GC_BUILDMENU, &CSkypeProto::OnGCMenuHook);

+	this->HookProtoEvent(ME_GC_EVENT, &CSkypeProto::OnGCEventHook);

+	this->HookProtoEvent(ME_GC_BUILDMENU, &CSkypeProto::OnGCMenuHook);

 }

 

 ///

diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp
index 7b1db8fa82..4c7cb48dc9 100644
--- a/protocols/Skype/src/skype_events.cpp
+++ b/protocols/Skype/src/skype_events.cpp
@@ -37,7 +37,7 @@ int CSkypeProto::OnProtoModulesLoaded(WPARAM, LPARAM)
 		bbd.dwDefPos = 100 + bbd.dwButtonID;

 		::CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);

 

-		this->HookEvent(ME_MSG_WINDOWEVENT, &CSkypeProto::OnSrmmWindowOpen);

+		this->HookProtoEvent(ME_MSG_WINDOWEVENT, &CSkypeProto::OnSrmmWindowOpen);

 	}

 

 	return 0;

diff --git a/protocols/Skype/src/skype_hooks.cpp b/protocols/Skype/src/skype_hooks.cpp
index 9e8f189863..13dc08c95b 100644
--- a/protocols/Skype/src/skype_hooks.cpp
+++ b/protocols/Skype/src/skype_hooks.cpp
@@ -8,10 +8,10 @@ void CSkypeProto::InitHookList()
 

 void CSkypeProto::InitInstanceHookList()

 {

-	this->HookEvent(ME_OPT_INITIALISE,		&CSkypeProto::OnOptionsInit);

-	this->HookEvent(ME_USERINFO_INITIALISE, &CSkypeProto::OnUserInfoInit);

+	this->HookProtoEvent(ME_OPT_INITIALISE,		&CSkypeProto::OnOptionsInit);

+	this->HookProtoEvent(ME_USERINFO_INITIALISE, &CSkypeProto::OnUserInfoInit);

 

-	this->HookEvent(ME_MSG_PRECREATEEVENT,	&CSkypeProto::OnMessagePreCreate);

+	this->HookProtoEvent(ME_MSG_PRECREATEEVENT,	&CSkypeProto::OnMessagePreCreate);

 

-	this->HookEvent(ME_MSG_BUTTONPRESSED,	&CSkypeProto::OnTabSRMMButtonPressed); 

+	this->HookProtoEvent(ME_MSG_BUTTONPRESSED,	&CSkypeProto::OnTabSRMMButtonPressed); 

 }

diff --git a/protocols/Skype/src/skype_menus.cpp b/protocols/Skype/src/skype_menus.cpp
index 4ff59cf601..69e4acce52 100644
--- a/protocols/Skype/src/skype_menus.cpp
+++ b/protocols/Skype/src/skype_menus.cpp
@@ -256,7 +256,7 @@ void CSkypeProto::OnInitStatusMenu()
 

 	// Invite Command

 	::strcpy(tDest, "/CreateChatRoom");

-	this->CreateService(tDest, &CSkypeProto::CreateChatRoomCommand);

+	this->CreateProtoService(tDest, &CSkypeProto::CreateChatRoomCommand);

 	mi.ptszName = LPGENT("Create conference");

 	mi.position = 200000 + SMI_CHAT_CREATE;

 	mi.icolibItem = CSkypeProto::GetSkinIconHandle("conference");

@@ -264,7 +264,7 @@ void CSkypeProto::OnInitStatusMenu()
 

 	// Invite Command

 	::strcpy(tDest, "/BlockedeList");

-	this->CreateService(tDest, &CSkypeProto::OpenBlockedListCommand);

+	this->CreateProtoService(tDest, &CSkypeProto::OpenBlockedListCommand);

 	mi.ptszName = LPGENT("Blocked contacts");

 	mi.position = 200000 + SMI_IGNORE_LIST;

 	mi.icolibItem = CSkypeProto::GetSkinIconHandle("block");

diff --git a/protocols/Skype/src/skype_services.cpp b/protocols/Skype/src/skype_services.cpp
index e6bdf123c0..9f2ac62434 100644
--- a/protocols/Skype/src/skype_services.cpp
+++ b/protocols/Skype/src/skype_services.cpp
@@ -9,17 +9,17 @@ void CSkypeProto::InitServiceList()
 void CSkypeProto::InitInstanceServiceList()

 {

 	// Message API

-	this->CreateService(PS_CREATEACCMGRUI, &CSkypeProto::OnAccountManagerInit);

+	this->CreateProtoService(PS_CREATEACCMGRUI, &CSkypeProto::OnAccountManagerInit);

 	// Chat API

-	this->CreateService(PS_JOINCHAT, &CSkypeProto::OnJoinChat);

-	this->CreateService(PS_LEAVECHAT, &CSkypeProto::OnLeaveChat);

+	this->CreateProtoService(PS_JOINCHAT, &CSkypeProto::OnJoinChat);

+	this->CreateProtoService(PS_LEAVECHAT, &CSkypeProto::OnLeaveChat);

 	// Own info

-	this->CreateService(PS_SETMYNICKNAME, &CSkypeProto::SetMyNickName);

+	this->CreateProtoService(PS_SETMYNICKNAME, &CSkypeProto::SetMyNickName);

 	// Avatar API

-	this->CreateService(PS_GETAVATARINFOT, &CSkypeProto::GetAvatarInfo);

-	this->CreateService(PS_GETAVATARCAPS, &CSkypeProto::GetAvatarCaps);

-	this->CreateService(PS_GETMYAVATART, &CSkypeProto::GetMyAvatar);

-	this->CreateService(PS_SETMYAVATART, &CSkypeProto::SetMyAvatar);

+	this->CreateProtoService(PS_GETAVATARINFOT, &CSkypeProto::GetAvatarInfo);

+	this->CreateProtoService(PS_GETAVATARCAPS, &CSkypeProto::GetAvatarCaps);

+	this->CreateProtoService(PS_GETMYAVATART, &CSkypeProto::GetMyAvatar);

+	this->CreateProtoService(PS_SETMYAVATART, &CSkypeProto::SetMyAvatar);

 	// service to get from protocol chat buddy info

-	this->CreateService(MS_GC_PROTO_GETTOOLTIPTEXT, &CSkypeProto::SkypeGCGetToolTipText);

+	this->CreateProtoService(MS_GC_PROTO_GETTOOLTIPTEXT, &CSkypeProto::SkypeGCGetToolTipText);

 }