From 5f8a607f900a42e27bf166b86185001aadf3e9f2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Feb 2014 13:50:53 +0000 Subject: more fun: - MS_AWAYMSG_GETSTATUSMSGW/T is present in any MIID_SRAWAY plugin, so there's no need to check its existence; - therefore MS_AWAYMSG_GETSTATUSMSG considered useless, cause it has no references git-svn-id: http://svn.miranda-ng.org/main/trunk@8293 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewAwaySysMod/src/AwaySys.cpp | 1 - plugins/NewAwaySysMod/src/Services.cpp | 12 ++---------- plugins/NewAwaySysMod/src/Services.h | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) (limited to 'plugins/NewAwaySysMod') diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp index 2ee9c2832a..bcfd76cecc 100644 --- a/plugins/NewAwaySysMod/src/AwaySys.cpp +++ b/plugins/NewAwaySysMod/src/AwaySys.cpp @@ -680,7 +680,6 @@ int MirandaLoaded(WPARAM, LPARAM) CreateServiceFunction(MS_AWAYSYS_AUTOREPLY_ON, srvAutoreplyOn); CreateServiceFunction(MS_AWAYSYS_AUTOREPLY_OFF, srvAutoreplyOff); CreateServiceFunction(MS_AWAYSYS_AUTOREPLY_USEDEFAULT, srvAutoreplyUseDefault); - CreateServiceFunction(MS_AWAYMSG_GETSTATUSMSG, GetStatusMsg); CreateServiceFunction(MS_AWAYMSG_GETSTATUSMSGW, GetStatusMsgW); CreateServiceFunction(MS_NAS_GETSTATEA, GetStateA); diff --git a/plugins/NewAwaySysMod/src/Services.cpp b/plugins/NewAwaySysMod/src/Services.cpp index bce50f84d3..686ad07cac 100644 --- a/plugins/NewAwaySysMod/src/Services.cpp +++ b/plugins/NewAwaySysMod/src/Services.cpp @@ -50,19 +50,11 @@ __inline void PSSetStatus(char *szProto, WORD Status, int bNoClistSetStatusMode // called by GamerStatus and built-in miranda autoaway module // wParam = (int)status, lParam = 0 // MS_AWAYMSG_GETSTATUSMSG "SRAway/GetStatusMessage" -INT_PTR GetStatusMsg(WPARAM wParam, LPARAM) -{ - LogMessage("MS_AWAYMSG_GETSTATUSMSG called. status=%d", wParam); - char *szMsg = mir_t2a(GetDynamicStatMsg(INVALID_CONTACT_ID, NULL, 0, wParam)); - LogMessage("returned szMsg:\n%s", szMsg ? szMsg : "NULL"); - return (INT_PTR)szMsg; -} - INT_PTR GetStatusMsgW(WPARAM wParam, LPARAM) { - LogMessage("MS_AWAYMSG_GETSTATUSMSG called. status=%d", wParam); + LogMessage("MS_AWAYMSG_GETSTATUSMSGW called. status=%d", wParam); WCHAR *szMsg = mir_t2u(GetDynamicStatMsg(INVALID_CONTACT_ID, NULL, 0, wParam)); - LogMessage("returned szMsg:\n%S", szMsg ? szMsg : L"NULL"); + LogMessage("returned szMsgW:\n%S", szMsg ? szMsg : L"NULL"); return (INT_PTR)szMsg; } diff --git a/plugins/NewAwaySysMod/src/Services.h b/plugins/NewAwaySysMod/src/Services.h index 2aac3c7cc0..ca81be7f75 100644 --- a/plugins/NewAwaySysMod/src/Services.h +++ b/plugins/NewAwaySysMod/src/Services.h @@ -17,7 +17,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -INT_PTR GetStatusMsg(WPARAM wParam, LPARAM lParam); INT_PTR GetStatusMsgW(WPARAM wParam, LPARAM lParam); INT_PTR SetStatusMode(WPARAM wParam, LPARAM lParam); // int IgnoreNextStatusChange(WPARAM wParam, LPARAM lParam); -- cgit v1.2.3