From 2754b2fba973e2b613ec5ecce1b549450d67acc9 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Mon, 6 Sep 2010 13:38:41 +0000
Subject: Added support for accounts

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@529 4f64403b-2f21-0410-a795-97e2b3489a10
---
 tipper/popwin.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'tipper/popwin.cpp')

diff --git a/tipper/popwin.cpp b/tipper/popwin.cpp
index 26afd34..7952c40 100644
--- a/tipper/popwin.cpp
+++ b/tipper/popwin.cpp
@@ -97,23 +97,25 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 						pwd->row_count++;
 					}
 
-					if(status >= ID_STATUS_OFFLINE && status <= ID_STATUS_IDLE) {
+					if(status >= ID_STATUS_OFFLINE && status <= ID_STATUS_IDLE) 
+					{
 						TCHAR *swzText = 0;
 						char *status_msg = 0;
 
 						// supported by protocols from Miranda 0.8+
-						char svc[256];
-						mir_snprintf(svc, 256, "%s%s", pwd->clcit.proto, PS_GETMYAWAYMSG);
-						if ( ServiceExists( svc )) {
-							TCHAR* p = (TCHAR *)CallProtoService(pwd->clcit.proto, PS_GETMYAWAYMSG, 0, SGMA_TCHAR);
-							if ( !p ) 
+						TCHAR* p = (TCHAR *)CallProtoService(pwd->clcit.proto, PS_GETMYAWAYMSG, 0, SGMA_TCHAR);
+						if ((INT_PTR)p != CALLSERVICE_NOTFOUND)
+						{
+							if (p == NULL) 
 								status_msg = (char *)CallProtoService(pwd->clcit.proto, PS_GETMYAWAYMSG, 0, 0);
-							else {
+							else 
+							{
 								swzText = _tcsdup( p );
 								mir_free( p );
 							}
 						}
-						else status_msg = (char *)CallService(MS_AWAYMSG_GETSTATUSMSG, status, 0);
+						else 
+							status_msg = (char *)CallService(MS_AWAYMSG_GETSTATUSMSG, status, 0);
 						
 						if(status_msg && status_msg[0]) swzText = a2t(status_msg);
 
-- 
cgit v1.2.3