summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-02-27 13:50:53 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-02-27 13:50:53 +0000
commit5f8a607f900a42e27bf166b86185001aadf3e9f2 (patch)
tree6c69f5caebc55e84437ddc23013fada0a69af397 /include
parent5e0f2fb896d874f9b7f5c069a90de64305089542 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/delphi/m_awaymsg.inc3
-rw-r--r--include/m_awaymsg.h7
-rw-r--r--include/m_protocols.h2
3 files changed, 5 insertions, 7 deletions
diff --git a/include/delphi/m_awaymsg.inc b/include/delphi/m_awaymsg.inc
index 021597c8ca..9f1bf262b7 100644
--- a/include/delphi/m_awaymsg.inc
+++ b/include/delphi/m_awaymsg.inc
@@ -35,12 +35,11 @@ const
MS_AWAYMSG_SHOWAWAYMSG:PAnsiChar = 'SRAway/GetMessage';
{
- returns: the default status message for a status
+ returns: (PWideChar) the default status message for a status
wParam=status
lParam=szProto
notes: returns status msg. Remember to free the return value
}
- MS_AWAYMSG_GETSTATUSMSG :PAnsiChar = 'SRAway/GetStatusMessage';
MS_AWAYMSG_GETSTATUSMSGW:PAnsiChar = 'SRAway/GetStatusMessageW';
{$ENDIF}
diff --git a/include/m_awaymsg.h b/include/m_awaymsg.h
index 78db3428c1..981ed6055c 100644
--- a/include/m_awaymsg.h
+++ b/include/m_awaymsg.h
@@ -32,17 +32,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//returns immediately, without waiting for the message to retrieve
#define MS_AWAYMSG_SHOWAWAYMSG "SRAway/GetMessage"
-//returns the default status message for a status
+//returns (TCHAR*)the default status message for a status
//wParam = (int)status
//lParam = (LPARAM)(char*)szProto
-//returns status msg. Remember to free the return value
-#define MS_AWAYMSG_GETSTATUSMSG "SRAway/GetStatusMessage"
+//returns status msg. Remember to free the return value using mir_free/ptrW
#define MS_AWAYMSG_GETSTATUSMSGW "SRAway/GetStatusMessageW"
#ifdef _UNICODE
#define MS_AWAYMSG_GETSTATUSMSGT MS_AWAYMSG_GETSTATUSMSGW
#else
-#define MS_AWAYMSG_GETSTATUSMSGT MS_AWAYMSG_GETSTATUSMSG
+#define MS_AWAYMSG_GETSTATUSMSGT not implemented
#endif
#endif // M_AWAYMSG_H__
diff --git a/include/m_protocols.h b/include/m_protocols.h
index b29fd4583d..67ffd950ff 100644
--- a/include/m_protocols.h
+++ b/include/m_protocols.h
@@ -336,7 +336,7 @@ __forceinline PROTOACCOUNT* ProtoGetAccount(const char* accName)
//Returns 1 if an account is valid and enabled, 0 otherwise
#define MS_PROTO_ISACCOUNTENABLED "Proto/IsAccountEnabled"
-__forceinline int IsAccountEnabled(const PROTOACCOUNT* pa)
+__forceinline int IsAccountEnabled(const PROTOACCOUNT *pa)
{
return (int)CallService(MS_PROTO_ISACCOUNTENABLED, 0, (LPARAM)pa);
}