Proto_GetStatus is used everywhere instead of PS_GETSTATUS

3 files changed, 0 insertions, 10 deletions

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);