- 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

2 files changed, 21 insertions, 21 deletions

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 1773b51ff2..a00e4e45e9 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -35,22 +35,22 @@ FacebookProto::FacebookProto(const char* proto_name,const TCHAR* username) :
 	facy.send_message_lock_ = CreateMutex(NULL, FALSE, NULL);

 	facy.fcb_conn_lock_ = CreateMutex(NULL, FALSE, NULL);

 

-	CreateService(PS_CREATEACCMGRUI, &FacebookProto::SvcCreateAccMgrUI);

-	CreateService(PS_GETMYAWAYMSG,   &FacebookProto::GetMyAwayMsg);

-	CreateService(PS_GETMYAVATART,   &FacebookProto::GetMyAvatar);

-	CreateService(PS_GETAVATARINFOT, &FacebookProto::GetAvatarInfo);

-	CreateService(PS_GETAVATARCAPS,  &FacebookProto::GetAvatarCaps);

-

-	CreateService(PS_JOINCHAT,  &FacebookProto::OnJoinChat);

-	CreateService(PS_LEAVECHAT, &FacebookProto::OnLeaveChat);

-

-	CreateService("/Mind", &FacebookProto::OnMind);

-

-	HookEvent(ME_CLIST_PREBUILDSTATUSMENU, &FacebookProto::OnBuildStatusMenu);

-	HookEvent(ME_OPT_INITIALISE,           &FacebookProto::OnOptionsInit);

-	HookEvent(ME_GC_EVENT,                 &FacebookProto::OnChatOutgoing);

-	HookEvent(ME_IDLE_CHANGED,             &FacebookProto::OnIdleChanged);

-	HookEvent(ME_TTB_MODULELOADED,         &FacebookProto::OnToolbarInit);

+	CreateProtoService(PS_CREATEACCMGRUI, &FacebookProto::SvcCreateAccMgrUI);

+	CreateProtoService(PS_GETMYAWAYMSG,   &FacebookProto::GetMyAwayMsg);

+	CreateProtoService(PS_GETMYAVATART,   &FacebookProto::GetMyAvatar);

+	CreateProtoService(PS_GETAVATARINFOT, &FacebookProto::GetAvatarInfo);

+	CreateProtoService(PS_GETAVATARCAPS,  &FacebookProto::GetAvatarCaps);

+

+	CreateProtoService(PS_JOINCHAT,  &FacebookProto::OnJoinChat);

+	CreateProtoService(PS_LEAVECHAT, &FacebookProto::OnLeaveChat);

+

+	CreateProtoService("/Mind", &FacebookProto::OnMind);

+

+	HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &FacebookProto::OnBuildStatusMenu);

+	HookProtoEvent(ME_OPT_INITIALISE,           &FacebookProto::OnOptionsInit);

+	HookProtoEvent(ME_GC_EVENT,                 &FacebookProto::OnChatOutgoing);

+	HookProtoEvent(ME_IDLE_CHANGED,             &FacebookProto::OnIdleChanged);

+	HookProtoEvent(ME_TTB_MODULELOADED,         &FacebookProto::OnToolbarInit);

 

 	char module[512];

 	mir_snprintf(module, sizeof(module), "%s/Mind", m_szModuleName);

diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index 054a05c134..ffed611d22 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -193,14 +193,14 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 	mi.flags = CMIF_CHILDPOPUP | (this->isOnline() ? 0 : CMIF_GRAYED);

 	mi.position = 201001;

 

-	//CreateService(m_szModuleName,"/Mind",&FacebookProto::OnMind,this);

+	//CreateProtoService(m_szModuleName,"/Mind",&FacebookProto::OnMind,this);

 	strcpy(tDest,"/Mind");

 	mi.hParentMenu = hRoot;

 	mi.pszName = LPGEN("Mind...");

 	mi.icolibItem = GetIconHandle("mind");

 	m_hStatusMind = Menu_AddProtoMenuItem(&mi);

 

-	CreateService("/VisitProfile",&FacebookProto::VisitProfile);

+	CreateProtoService("/VisitProfile",&FacebookProto::VisitProfile);

 	strcpy(tDest,"/VisitProfile");

 	mi.flags = CMIF_CHILDPOPUP;

 	mi.pszName = LPGEN("Visit profile");

@@ -215,7 +215,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 	mi.icolibItem = NULL;

 	m_hMenuServicesRoot = Menu_AddProtoMenuItem(&mi);

 

-	CreateService("/RefreshBuddyList",&FacebookProto::RefreshBuddyList);

+	CreateProtoService("/RefreshBuddyList",&FacebookProto::RefreshBuddyList);

 	strcpy(tDest,"/RefreshBuddyList");

 	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Refresh Buddy List");

@@ -224,7 +224,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 	mi.hParentMenu = m_hMenuServicesRoot;

 	Menu_AddProtoMenuItem(&mi);

 

-	CreateService("/CheckFriendRequests",&FacebookProto::CheckFriendRequests);

+	CreateProtoService("/CheckFriendRequests",&FacebookProto::CheckFriendRequests);

 	strcpy(tDest,"/CheckFriendRequests");

 	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Check Friends Requests");

@@ -232,7 +232,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam)
 	mi.hParentMenu = m_hMenuServicesRoot;

 	Menu_AddProtoMenuItem(&mi);

 

-	CreateService("/CheckNewsfeeds",&FacebookProto::CheckNewsfeeds);

+	CreateProtoService("/CheckNewsfeeds",&FacebookProto::CheckNewsfeeds);

 	strcpy(tDest,"/CheckNewsfeeds");

 	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Check Newsfeeds");