Proto_GetStatus is used everywhere instead of PS_GETSTATUS

7 files changed, 0 insertions, 24 deletions

diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index 8884cc0ff8..b4207c66f0 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -50,7 +50,6 @@ CDiscordProto::CDiscordProto(const char *proto_name, const wchar_t *username) :
 	arUsers(10, compareUsers)
 {
 	// Services
-	CreateProtoService(PS_GETSTATUS, &CDiscordProto::GetStatus);
 	CreateProtoService(PS_CREATEACCMGRUI, &CDiscordProto::SvcCreateAccMgrUI);
 
 	CreateProtoService(PS_GETAVATARINFO, &CDiscordProto::GetAvatarInfo);
@@ -121,11 +120,6 @@ DWORD_PTR CDiscordProto::GetCaps(int type, MCONTACT)
 	return 0;
 }
 
-INT_PTR CDiscordProto::GetStatus(WPARAM, LPARAM)
-{
-	return m_iStatus;
-}
-
 int CDiscordProto::SetStatus(int iNewStatus)
 {
 	debugLogA("CDiscordProto::SetStatus iNewStatus = %d, m_iStatus = %d, m_iDesiredStatus = %d m_hWorkerThread = %p", iNewStatus, m_iStatus, m_iDesiredStatus, m_hWorkerThread);
diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index 49715cccd6..99fb50ecf6 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -283,7 +283,6 @@ public:
 
 	// Services
 	INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM, LPARAM);
-	INT_PTR __cdecl GetStatus(WPARAM, LPARAM);
 
 	INT_PTR __cdecl GetAvatarCaps(WPARAM, LPARAM);
 	INT_PTR __cdecl GetAvatarInfo(WPARAM, LPARAM);
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index 860a9f14ee..e02d755a40 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -47,14 +47,6 @@ INT_PTR CSametimeProto::GetName(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-/*

- * Returns the current status

- */

-INT_PTR CSametimeProto::GetStatus(WPARAM wParam, LPARAM lParam)

-{

-	return m_iStatus;

-}

-

 

 /** Loads the icon corresponding to the status

 * Called by the CList when the status changes.

diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index a7cf8202d2..382c941c51 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -29,7 +29,6 @@ CSametimeProto::CSametimeProto(const char* pszProtoName, const wchar_t* tszUserN
 	SametimeInitIcons();

 

 	CreateProtoService(PS_GETNAME, &CSametimeProto::GetName);

-	CreateProtoService(PS_GETSTATUS, &CSametimeProto::GetStatus);

 	CreateProtoService(PS_LOADICON, &CSametimeProto::SametimeLoadIcon);

 

 	HookProtoEvent(ME_SYSTEM_MODULESLOADED, &CSametimeProto::OnModulesLoaded);

diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index 37c94513c2..e22186b16e 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -50,7 +50,6 @@ struct CSametimeProto : public PROTO<CSametimeProto>
 	// sametime.cpp

 	int __cdecl OnSametimeContactDeleted(WPARAM wParam, LPARAM lParam);

 	INT_PTR __cdecl GetName(WPARAM wParam, LPARAM lParam);

-	INT_PTR __cdecl GetStatus(WPARAM wParam, LPARAM lParam);

 	INT_PTR __cdecl SametimeLoadIcon(WPARAM wParam, LPARAM lParam);

 	int __cdecl OnWindowEvent(WPARAM wParam, LPARAM lParam);

 	int __cdecl OnModulesLoaded(WPARAM wParam, LPARAM lParam);

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 615db54869..f25e7d86df 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -30,7 +30,6 @@ TwitterProto::TwitterProto(const char *proto_name, const wchar_t *username) :
 	PROTO<TwitterProto>(proto_name, username)

 {

 	CreateProtoService(PS_CREATEACCMGRUI, &TwitterProto::SvcCreateAccMgrUI);

-	CreateProtoService(PS_GETSTATUS, &TwitterProto::GetStatus);

 

 	CreateProtoService(PS_JOINCHAT, &TwitterProto::OnJoinChat);

 	CreateProtoService(PS_LEAVECHAT, &TwitterProto::OnLeaveChat);

@@ -195,11 +194,6 @@ INT_PTR TwitterProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam)
 	return (INT_PTR)CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_TWITTERACCOUNT), (HWND)lParam, first_run_dialog, (LPARAM)this);

 }

 

-INT_PTR TwitterProto::GetStatus(WPARAM, LPARAM)

-{

-	return m_iStatus;

-}

-

 INT_PTR TwitterProto::ReplyToTweet(WPARAM wParam, LPARAM)

 {

 	MCONTACT hContact = (MCONTACT) wParam;

diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h
index 0d5420bdc0..79fee1f1e0 100644
--- a/protocols/Twitter/src/proto.h
+++ b/protocols/Twitter/src/proto.h
@@ -48,7 +48,6 @@ public:
 

 	// Services

 	INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM,LPARAM);

-	INT_PTR __cdecl GetStatus(WPARAM,LPARAM);

 	INT_PTR __cdecl ReplyToTweet(WPARAM,LPARAM);

 	INT_PTR __cdecl VisitHomepage(WPARAM,LPARAM);

 	INT_PTR __cdecl GetAvatar(WPARAM,LPARAM);