summaryrefslogtreecommitdiff
path: root/plugins/NewXstatusNotify
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-20 13:36:00 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-20 13:36:00 +0000
commit5b378496114ec47ffa27d3d9e7bc2a744d9e0a77 (patch)
treef7550dadde23f61182af6e542101eb5fedfa2d85 /plugins/NewXstatusNotify
parent0ba80eef50988ca3e88a16839eaf0a840f1cb139 (diff)
- 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
Diffstat (limited to 'plugins/NewXstatusNotify')
-rw-r--r--plugins/NewXstatusNotify/src/common.h2
-rw-r--r--plugins/NewXstatusNotify/src/xstatus.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/NewXstatusNotify/src/common.h b/plugins/NewXstatusNotify/src/common.h
index e44291ed75..1f988183a1 100644
--- a/plugins/NewXstatusNotify/src/common.h
+++ b/plugins/NewXstatusNotify/src/common.h
@@ -67,7 +67,7 @@
#include "m_system.h"
#include "m_userinfo.h"
#include "m_utils.h"
-#include "m_icq.h"
+#include "m_xstatus.h"
#include "m_extraicons.h"
#include "m_metacontacts.h"
diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index f80caba2f1..bc2bb541e6 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -151,7 +151,7 @@ void ShowPopup(XSTATUSCHANGE *xsc)
case TYPE_ICQ_XSTATUS:
{
int statusId = db_get_b(xsc->hContact, xsc->szProto, "XStatusId", 0);
- ppd.lchIcon = (HICON)CallProtoService(xsc->szProto, PS_ICQ_GETCUSTOMSTATUSICON, statusId, LR_SHARED);
+ ppd.lchIcon = (HICON)CallProtoService(xsc->szProto, PS_GETCUSTOMSTATUSICON, statusId, LR_SHARED);
}
}
@@ -367,12 +367,12 @@ TCHAR *GetDefaultXstatusName(int statusID, char *szProto, TCHAR *buff, int buffl
TCHAR nameBuff[64];
buff[0] = 0;
- ICQ_CUSTOM_STATUS xstatus = {0};
- xstatus.cbSize = sizeof(ICQ_CUSTOM_STATUS);
+ CUSTOM_STATUS xstatus = {0};
+ xstatus.cbSize = sizeof(CUSTOM_STATUS);
xstatus.flags = CSSF_MASK_NAME | CSSF_DEFAULT_NAME | CSSF_TCHAR;
xstatus.ptszName = nameBuff;
xstatus.wParam = (WPARAM *)&statusID;
- if (!CallProtoService(szProto, PS_ICQ_GETCUSTOMSTATUSEX, 0, (LPARAM)&xstatus)) {
+ if (!CallProtoService(szProto, PS_GETCUSTOMSTATUSEX, 0, (LPARAM)&xstatus)) {
_tcsncpy(buff, TranslateTS(nameBuff), bufflen);
buff[bufflen - 1] = 0;
}