From d3682337f0f94c3102d1a6f202a4fde471309fc8 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 12 Oct 2014 17:11:37 +0000 Subject: [PATCH] Set new messages to unread git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7599 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/gxs/rsgenexchange.cc | 2 +- libretroshare/src/retroshare/rsgxsflags.h | 4 ++-- libretroshare/src/services/p3gxschannels.cc | 4 ++-- libretroshare/src/services/p3gxsforums.cc | 4 ++-- libretroshare/src/services/p3postbase.cc | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc index 0ca579832..6100c6f06 100644 --- a/libretroshare/src/gxs/rsgenexchange.cc +++ b/libretroshare/src/gxs/rsgenexchange.cc @@ -2493,7 +2493,7 @@ void RsGenExchange::processRecvdMessages() if(validateReturn == VALIDATE_SUCCESS) { - meta->mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_GUI_NEW; + meta->mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; msgs.insert(std::make_pair(msg, meta)); msgIds[msg->grpId].push_back(msg->msgId); diff --git a/libretroshare/src/retroshare/rsgxsflags.h b/libretroshare/src/retroshare/rsgxsflags.h index 58f320639..a7cc27ee4 100644 --- a/libretroshare/src/retroshare/rsgxsflags.h +++ b/libretroshare/src/retroshare/rsgxsflags.h @@ -99,7 +99,7 @@ namespace GXS_SERV { static const uint32_t GXS_MSG_STATUS_UNPROCESSED = 0x00000001; - static const uint32_t GXS_MSG_STATUS_GUI_USER_UNREAD = 0x00000002; + static const uint32_t GXS_MSG_STATUS_GUI_UNREAD = 0x00000002; static const uint32_t GXS_MSG_STATUS_GUI_NEW = 0x00000004; @@ -121,7 +121,7 @@ namespace GXS_SERV { // GENERIC GXS MACROS #define IS_MSG_NEW(status) (status & GXS_SERV::GXS_MSG_STATUS_GUI_NEW) -#define IS_MSG_UNREAD(status) (status & GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD) +#define IS_MSG_UNREAD(status) (status & GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD) #define IS_GROUP_ADMIN(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) #define IS_GROUP_PUBLISHER(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH) diff --git a/libretroshare/src/services/p3gxschannels.cc b/libretroshare/src/services/p3gxschannels.cc index c386316db..720a2aa81 100644 --- a/libretroshare/src/services/p3gxschannels.cc +++ b/libretroshare/src/services/p3gxschannels.cc @@ -804,8 +804,8 @@ void p3GxsChannels::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPai std::cerr << std::endl; /* Always remove status unprocessed */ - uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD; - uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD; + uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; + uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; if (read) { status = 0; diff --git a/libretroshare/src/services/p3gxsforums.cc b/libretroshare/src/services/p3gxsforums.cc index 65662eff6..efb725dff 100644 --- a/libretroshare/src/services/p3gxsforums.cc +++ b/libretroshare/src/services/p3gxsforums.cc @@ -268,8 +268,8 @@ bool p3GxsForums::createMsg(uint32_t &token, RsGxsForumMsg &msg) void p3GxsForums::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) { - uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD; - uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD; + uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; + uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; if (read) { status = 0; diff --git a/libretroshare/src/services/p3postbase.cc b/libretroshare/src/services/p3postbase.cc index a42e40209..6fe3e1c8c 100644 --- a/libretroshare/src/services/p3postbase.cc +++ b/libretroshare/src/services/p3postbase.cc @@ -150,8 +150,8 @@ void p3PostBase::service_tick() void p3PostBase::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) { - uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD; - uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD; + uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; + uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD; if (read) { status = 0;