From 3b9902d7fa0137e2a84b1691110271560278c9fe Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Fri, 7 Mar 2014 22:05:19 +0000 Subject: MRA * Fix: Display Inbox Status git-svn-id: http://svn.miranda-ng.org/main/trunk@8468 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/MraProto.h | 2 +- protocols/MRA/src/Mra_functions.cpp | 4 ++-- protocols/MRA/src/Mra_menus.cpp | 2 +- protocols/MRA/src/Mra_proto.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols') diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h index 55edc11ece..7bb9cc97f0 100644 --- a/protocols/MRA/src/MraProto.h +++ b/protocols/MRA/src/MraProto.h @@ -246,7 +246,7 @@ struct CMraProto : public PROTO DWORD MraSetContactStatus(MCONTACT hContact, DWORD dwNewStatus); DWORD MraContactCapabilitiesGet(MCONTACT hContact); void MraContactCapabilitiesSet(MCONTACT hContact, DWORD dwFutureFlags); - void MraUpdateEmailStatus(const CMStringA &szFrom, const CMStringA &szSubject, DWORD dwDate, DWORD dwUIDL); + void MraUpdateEmailStatus(const CMStringA &szFrom, const CMStringA &szSubject, DWORD dwDate, DWORD dwUIDL, bool force_display); DWORD MraConvertToRTFW(const CMStringW &wszMessage, CMStringA &szMessageRTF); DWORD StartConnect(); diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index 427ddfe46d..e906bf4315 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -632,7 +632,7 @@ DWORD CMraProto::MraSetContactStatus(MCONTACT hContact, DWORD dwNewStatus) return dwOldStatus; } -void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &pszSubject, DWORD dwDate, DWORD dwUIDL) +void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &pszSubject, DWORD dwDate, DWORD dwUIDL, bool force_display) { BOOL bTrayIconNewMailNotify; WCHAR szStatusText[MAX_SECONDLINE]; @@ -685,7 +685,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA & else MraPopupShowFromAgentW(MRA_POPUP_TYPE_EMAIL_STATUS, (MRA_POPUP_ALLOW_ENTER), szStatusText); } else { - if (getByte("IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY)) { + if ( !force_display && getByte("IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY)) { if (bTrayIconNewMailNotify) CallService(MS_CLIST_REMOVEEVENT, 0, (LPARAM)m_szModuleName); PUDeletePopup(hWndEMailPopupStatus); diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index 3d429ca4ee..5371cec28c 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -9,7 +9,7 @@ INT_PTR CMraProto::MraGotoInbox(WPARAM wParam, LPARAM lParam) INT_PTR CMraProto::MraShowInboxStatus(WPARAM wParam, LPARAM lParam) { - MraUpdateEmailStatus("", "", 0, 0); + MraUpdateEmailStatus("", "", 0, 0, true); return 0; } diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index 1399a0f1bf..46c35bd337 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -516,7 +516,7 @@ bool CMraProto::CmdUserInfo(BinBuffer &buf) } else _CrtDbgBreak(); } - MraUpdateEmailStatus("", "", 0, 0); + MraUpdateEmailStatus("", "", 0, 0, false); return true; } @@ -1416,7 +1416,7 @@ bool CMraProto::CmdNewMail(BinBuffer &buf) DWORD dwSave = m_dwEmailMessagesUnread; m_dwEmailMessagesUnread = dwUnreadCount;// store new value if (getByte("IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY) == 0 || dwSave < dwUnreadCount || dwUnreadCount == 0) - MraUpdateEmailStatus(szEmail, szString, dwDate, dwUIDL); + MraUpdateEmailStatus(szEmail, szString, dwDate, dwUIDL, false); return true; } @@ -1496,7 +1496,7 @@ bool CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader) dwAckType = m_dwEmailMessagesUnread;// save old value m_dwEmailMessagesUnread = dwTemp;// store new value if (getByte("IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY) == 0 || dwAckType < dwTemp || dwTemp == 0) - MraUpdateEmailStatus("", "", 0, 0); + MraUpdateEmailStatus("", "", 0, 0, false); break; case MRIM_CS_SMS_ACK: -- cgit v1.2.3