MRA

+ Add: hidden option "xStatusShowAll" to allow select x-status Dating
* Fix: Blog status icon does not display
* Fix: SetContactStatus for contacts without authorization on user info update* code cleanup




git-svn-id: http://svn.miranda-ng.org/main/trunk@8445 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 2 insertions, 7 deletions

diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h
index b2276778f4..457d421ed7 100644
--- a/protocols/MRA/src/Mra.h
+++ b/protocols/MRA/src/Mra.h
@@ -33,8 +33,6 @@
 #include <time.h>

 #include <commctrl.h>

 

-#define bzero(pvDst, count) memset(pvDst, 0, count)

-

 #include "../../plugins/zlib/src/zlib.h"

 

 #include <newpluginapi.h>

@@ -204,14 +202,12 @@ CMStringA MraGetSelfVersionString();
 #define SetBit(bytes, bitpos) bytes |= (1<<bitpos)

 #define GetBit(bytes, bitpos) ((bytes&(1<<bitpos))? TRUE:FALSE)

 

-#define IsXStatusValid(XStatus) (((XStatus) && (XStatus)<MRA_XSTATUS_COUNT))

+#define IsXStatusValid(XStatus) (((XStatus) && (XStatus) < MRA_XSTATUS_COUNT))

 

-#define GET_CURRENT_COMBO_DATA(hWndDlg, ControlID)					SendDlgItemMessage(hWndDlg, ControlID, CB_GETITEMDATA, SendDlgItemMessage(hWndDlg, ControlID, CB_GETCURSEL, 0, 0), 0)

+#define GET_CURRENT_COMBO_DATA(hWndDlg, ControlID)	SendDlgItemMessage(hWndDlg, ControlID, CB_GETITEMDATA, SendDlgItemMessage(hWndDlg, ControlID, CB_GETCURSEL, 0, 0), 0)

 

 #define IsFileExist(FileName) (GetFileAttributes(FileName) != INVALID_FILE_ATTRIBUTES)

 

-#define IsThreadAlive(hThread) (GetThreadPriority(hThread) != THREAD_PRIORITY_ERROR_RETURN)

-

 void      MraAddrListFree(MRA_ADDR_LIST *pmalAddrList);

 DWORD     MraAddrListGetFromBuff(const CMStringA &szAddresses, MRA_ADDR_LIST *pmalAddrList);

 CMStringA MraAddrListGetToBuff(MRA_ADDR_LIST *pmalAddrList);

@@ -238,7 +234,6 @@ bool      MraRequestXStatusDetails(DWORD dwXStatus);
 bool      MraSendReplyBlogStatus(MCONTACT hContact);

 DWORD     GetYears(CONST PSYSTEMTIME pcstSystemTime);

 DWORD     FindFile(LPWSTR lpszFolder, DWORD dwFolderLen, LPWSTR lpszFileName, DWORD dwFileNameLen, LPWSTR lpszRetFilePathName, DWORD dwRetFilePathLen, DWORD *pdwRetFilePathLen);

-DWORD     MemFillRandom(LPVOID lpBuff, size_t dwBuffSize);

 

 DWORD     GetMraStatusFromMiradaStatus(DWORD dwMirandaStatus, DWORD dwXStatusMir, DWORD *pdwXStatusMra);

 DWORD     GetMirandaStatusFromMraStatus(DWORD dwMraStatus, DWORD dwXStatusMra, DWORD *pdwXStatusMir);