From 5b378496114ec47ffa27d3d9e7bc2a744d9e0a77 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 20 Nov 2012 13:36:00 +0000
Subject: - all xstatus services moved to m_xstatus.h - old obsoleted services
 PS_GETXSTATUS & PS_SETXSTATUS removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@2390 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/CSList/cslist_10.vcxproj.filters | 3 ---
 plugins/CSList/src/cslist.cpp            | 8 ++++----
 plugins/CSList/src/cslist.h              | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'plugins/CSList')

diff --git a/plugins/CSList/cslist_10.vcxproj.filters b/plugins/CSList/cslist_10.vcxproj.filters
index eb57988f85..57c03ce842 100644
--- a/plugins/CSList/cslist_10.vcxproj.filters
+++ b/plugins/CSList/cslist_10.vcxproj.filters
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{0c22408f-3e3b-4310-970e-525e94308c9d}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
-    <Filter Include="Other">
-      <UniqueIdentifier>{072cb5e6-88d2-4b64-a2ee-b49ae44f8b49}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cslist.cpp">
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp
index 7c0c4b23b5..9f1a80b810 100644
--- a/plugins/CSList/src/cslist.cpp
+++ b/plugins/CSList/src/cslist.cpp
@@ -257,8 +257,8 @@ void CSList::setStatus( WORD code, StatusItem* item,  char* protoName)
 	int statusToSet = -1;
 	if (lstrcmpA(pdescr->szProtoName, "ICQ") == 0)
 	{
-		ICQ_CUSTOM_STATUS ics = {0};
-		ics.cbSize = sizeof(ICQ_CUSTOM_STATUS);
+		CUSTOM_STATUS ics = {0};
+		ics.cbSize = sizeof(CUSTOM_STATUS);
 		ics.flags = CSSF_MASK_STATUS | CSSF_MASK_NAME | CSSF_MASK_MESSAGE | CSSF_TCHAR;
 
 		if (code == IDC_CANCEL)
@@ -278,13 +278,13 @@ void CSList::setStatus( WORD code, StatusItem* item,  char* protoName)
 		ics.status = &statusToSet;
 
 		char protoService[64];
-		mir_snprintf(protoService, SIZEOF(protoService), "%s%s", protoName, PS_ICQ_SETCUSTOMSTATUSEX);
+		mir_snprintf(protoService, SIZEOF(protoService), "%s%s", protoName, PS_SETCUSTOMSTATUSEX);
 		CallService(protoService, 0, (LPARAM)&ics);
 	}
 	if (lstrcmpA(pdescr->szProtoName, "JABBER") == 0)
 	{
 		JABBER_CUSTOM_STATUS ics = {0};
-		ics.cbSize = sizeof(ICQ_CUSTOM_STATUS);
+		ics.cbSize = sizeof(CUSTOM_STATUS);
 		ics.flags = CSSF_MASK_STATUS | CSSF_MASK_NAME | CSSF_MASK_MESSAGE | CSSF_TCHAR;
 
 		if (code == IDC_CANCEL)
diff --git a/plugins/CSList/src/cslist.h b/plugins/CSList/src/cslist.h
index ec2e533771..fa66a2c116 100644
--- a/plugins/CSList/src/cslist.h
+++ b/plugins/CSList/src/cslist.h
@@ -69,7 +69,7 @@
 #include <m_icolib.h>
 #include <m_protocols.h>
 #include <m_protosvc.h>
-#include <m_icq.h>
+#include <m_xstatus.h>
 #include <m_jabber.h>
 #include <m_options.h>
 #include <m_hotkeys.h>
-- 
cgit v1.2.3