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/TipperYM/src/common.h         | 1 +
 plugins/TipperYM/src/popwin.cpp       | 4 ++--
 plugins/TipperYM/src/translations.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'plugins/TipperYM')

diff --git a/plugins/TipperYM/src/common.h b/plugins/TipperYM/src/common.h
index 9098589d1c..d66c1bd221 100644
--- a/plugins/TipperYM/src/common.h
+++ b/plugins/TipperYM/src/common.h
@@ -76,6 +76,7 @@ Boston, MA 02111-1307, USA.
 #include <m_system.h>
 #include <m_timezones.h>
 #include <m_utils.h>
+#include <m_xstatus.h>
 #include <m_icq.h>
 
 #include "resource.h"
diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index a5a9b59bfe..34cf0f596a 100644
--- a/plugins/TipperYM/src/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
@@ -205,7 +205,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 						// get advanced status icon
 						if (pwd->bIsIconVisible[1])
 						{
-							pwd->extraIcons[1].hIcon = (HICON)CallProtoService(pwd->clcit.szProto, PS_ICQ_GETCUSTOMSTATUSICON, 0, 0);
+							pwd->extraIcons[1].hIcon = (HICON)CallProtoService(pwd->clcit.szProto, PS_GETCUSTOMSTATUSICON, 0, 0);
 							pwd->extraIcons[1].bDestroy = true;
 						}
 					}
@@ -413,7 +413,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 								DBFreeVariant(&dbv);
 							}
 
-							pwd->extraIcons[i].hIcon = (HICON)CallProtoService(szIconProto, PS_ICQ_GETCUSTOMSTATUSICON, (WPARAM)iXstatus, LR_SHARED);
+							pwd->extraIcons[i].hIcon = (HICON)CallProtoService(szIconProto, PS_GETCUSTOMSTATUSICON, (WPARAM)iXstatus, LR_SHARED);
 							pwd->extraIcons[i].bDestroy = false;	
 						}
 					}
diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp
index 1fd6e67c39..714c769f2d 100644
--- a/plugins/TipperYM/src/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
@@ -583,7 +583,7 @@ TCHAR *DayMonthToDaysToNextBirthday(HANDLE hContact, const char *szModuleName, c
 TCHAR *EmptyXStatusToDefaultName(HANDLE hContact, const char *szModuleName, const char *szSettingName, TCHAR *buff, int bufflen) 
 {
 	TCHAR szDefaultName[1024];
-	ICQ_CUSTOM_STATUS xstatus = {0};
+	CUSTOM_STATUS xstatus = {0};
 	DBVARIANT dbv;
 
 	// translate jabber mood
@@ -603,13 +603,13 @@ TCHAR *EmptyXStatusToDefaultName(HANDLE hContact, const char *szModuleName, cons
 	int status = DBGetContactSettingByte(hContact, szModuleName, "XStatusId", 0);
 	if (!status) return 0;
 	
-	if (ProtoServiceExists(szModuleName, PS_ICQ_GETCUSTOMSTATUSEX))
+	if (ProtoServiceExists(szModuleName, PS_GETCUSTOMSTATUSEX))
 	{ 
-		xstatus.cbSize = sizeof(ICQ_CUSTOM_STATUS);
+		xstatus.cbSize = sizeof(CUSTOM_STATUS);
 		xstatus.flags = CSSF_MASK_NAME | CSSF_DEFAULT_NAME | CSSF_TCHAR;
 		xstatus.ptszName = szDefaultName;
 		xstatus.wParam = (WPARAM *)&status;
-		if (CallProtoService(szModuleName, PS_ICQ_GETCUSTOMSTATUSEX, 0, (LPARAM)&xstatus))
+		if (CallProtoService(szModuleName, PS_GETCUSTOMSTATUSEX, 0, (LPARAM)&xstatus))
 		   return 0;
 		
 		_tcsncpy(buff, TranslateTS(szDefaultName), bufflen);
-- 
cgit v1.2.3