StatusManager:

- fix for the 'Ignore locked account statuses' checkbox behaviour;
- massive code cleaning;
- version bump

1 files changed, 9 insertions, 11 deletions

diff --git a/plugins/ExternalAPI/m_statusplugins.h b/plugins/ExternalAPI/m_statusplugins.h
index 63e39e80b3..1e1c57f2a3 100644
--- a/plugins/ExternalAPI/m_statusplugins.h
+++ b/plugins/ExternalAPI/m_statusplugins.h
@@ -23,12 +23,11 @@
 

 // -- common status -- (all three plugins)

 typedef struct {

-	int cbSize;

-	char *szName;	// pointer to protocol modulename

-	TCHAR *szMsg;	// pointer to the status message (may be NULL)

-	WORD status;	// the status

-	WORD lastStatus;// last status

-	TCHAR *tszAccName;

+	char *m_szName;	// pointer to protocol modulename

+	TCHAR *m_szMsg;	// pointer to the status message (may be NULL)

+	WORD m_status;	// the status

+	WORD m_lastStatus;// last status

+	TCHAR *m_tszAccName;

 } PROTOCOLSETTINGEX;

 

 // wParam = PROTOCOLSETTINGEX*** (keep it like this for compatibility)

@@ -136,11 +135,10 @@ typedef struct {
 __inline static int announce_status_change(char *szProto, int newstatus, TCHAR *szMsg) {

 

 	PROTOCOLSETTINGEX ps = { 0 };

-	ps.cbSize = sizeof(PROTOCOLSETTINGEX);

-	ps.lastStatus = szProto != NULL ? CallProtoService(szProto, PS_GETSTATUS, 0, 0) : CallService(MS_CLIST_GETSTATUSMODE, 0, 0);

-	ps.status = newstatus;

-	ps.szMsg = szMsg;

-	ps.szName = szProto;

+	ps.m_lastStatus = szProto != NULL ? CallProtoService(szProto, PS_GETSTATUS, 0, 0) : CallService(MS_CLIST_GETSTATUSMODE, 0, 0);

+	ps.m_status = newstatus;

+	ps.m_szMsg = szMsg;

+	ps.m_szName = szProto;

 	return CallService(MS_KS_ANNOUNCESTATUSCHANGE, 0, (LPARAM)&ps);

 }