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
---
 protocols/MRA/src/Mra_svcs.cpp | 41 ++++++++++-------------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

(limited to 'protocols/MRA/src/Mra_svcs.cpp')

diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index d61098201a..a845a88d89 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -794,24 +794,13 @@ DWORD CMraProto::MraSetXStatusInternal(DWORD dwXStatus)
 	return dwOldStatusMode;
 }
 
-// obsolete (TODO: remove in next version)
-INT_PTR CMraProto::MraSetXStatus(WPARAM wParam, LPARAM lParam)
-{
-	INT_PTR iRet = 0;
-	if ( IsXStatusValid(wParam) || wParam == MRA_MIR_XSTATUS_NONE) {
-		MraSetXStatusInternal(wParam);
-		iRet = wParam;
-	}
-	return iRet;
-}
-
 INT_PTR CMraProto::MraSetXStatusEx(WPARAM wParam, LPARAM lParam)
 {
 	INT_PTR iRet = 1;
 	DWORD dwXStatus;
-	ICQ_CUSTOM_STATUS *pData = (ICQ_CUSTOM_STATUS*)lParam;
+	CUSTOM_STATUS *pData = (CUSTOM_STATUS*)lParam;
 
-	if (pData->cbSize >= sizeof(ICQ_CUSTOM_STATUS)) {
+	if (pData->cbSize >= sizeof(CUSTOM_STATUS)) {
 		iRet = 0;
 
 		if (pData->flags & CSSF_MASK_STATUS) {
@@ -884,24 +873,13 @@ INT_PTR CMraProto::MraSetXStatusEx(WPARAM wParam, LPARAM lParam)
 	return iRet;
 }
 
-INT_PTR CMraProto::MraGetXStatus(WPARAM wParam, LPARAM lParam)
-{
-	if (m_bLoggedIn) {
-		if (wParam) *((CHAR**)wParam) = DBSETTING_XSTATUSNAME;
-		if (lParam) *((CHAR**)lParam) = DBSETTING_XSTATUSMSG;
-		return m_iXStatus;
-	}
-
-	return 0;
-}
-
 INT_PTR CMraProto::MraGetXStatusEx(WPARAM wParam, LPARAM lParam)
 {
 	INT_PTR iRet = 1;
 	HANDLE hContact = (HANDLE)wParam;
-	ICQ_CUSTOM_STATUS *pData = (ICQ_CUSTOM_STATUS*)lParam;
+	CUSTOM_STATUS *pData = (CUSTOM_STATUS*)lParam;
 
-	if (pData->cbSize >= sizeof(ICQ_CUSTOM_STATUS)) {
+	if (pData->cbSize >= sizeof(CUSTOM_STATUS)) {
 		DWORD dwXStatus;
 
 		iRet = 0;
@@ -913,11 +891,10 @@ INT_PTR CMraProto::MraGetXStatusEx(WPARAM wParam, LPARAM lParam)
 		// fill status name member
 		if (pData->flags & CSSF_MASK_NAME) {
 			if (pData->flags & CSSF_DEFAULT_NAME) {
-				dwXStatus = (*pData->wParam);
+				dwXStatus = (pData->wParam == NULL) ? m_iXStatus : *pData->wParam;
 				if ( IsXStatusValid(dwXStatus)) {
-					if (pData->flags & CSSF_UNICODE) {
+					if (pData->flags & CSSF_UNICODE)
 						lstrcpynW(pData->pwszName, lpcszXStatusNameDef[dwXStatus], (STATUS_TITLE_MAX+1));
-					}
 					else {
 						size_t dwStatusTitleSize = lstrlenW( lpcszXStatusNameDef[dwXStatus] );
 						if (dwStatusTitleSize>STATUS_TITLE_MAX) dwStatusTitleSize = STATUS_TITLE_MAX;
@@ -938,10 +915,12 @@ INT_PTR CMraProto::MraGetXStatusEx(WPARAM wParam, LPARAM lParam)
 
 		// fill status message member
 		if (pData->flags & CSSF_MASK_MESSAGE) {
+			char szSetting[100];
+			mir_snprintf(szSetting, SIZEOF(szSetting), "XStatus%dMsg", m_iXStatus);
 			if (pData->flags & CSSF_UNICODE)
-				mraGetStaticStringW(hContact, DBSETTING_XSTATUSMSG, pData->pwszMessage, (STATUS_DESC_MAX+1), NULL);
+				mraGetStaticStringW(hContact, szSetting, pData->pwszMessage, (STATUS_DESC_MAX+1), NULL);
 			else
-				mraGetStaticStringA(hContact, DBSETTING_XSTATUSMSG, pData->pszMessage, (STATUS_DESC_MAX+1), NULL);
+				mraGetStaticStringA(hContact, szSetting, pData->pszMessage, (STATUS_DESC_MAX+1), NULL);
 		}
 
 		if (pData->flags & CSSF_DISABLE_UI)
-- 
cgit v1.2.3