diff --git a/modules/aum/backend.py b/modules/aum/backend.py index b1a51a6d..ff70fbed 100644 --- a/modules/aum/backend.py +++ b/modules/aum/backend.py @@ -202,9 +202,9 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh if int(mail['id_from']) == self.browser.my_id: if int(mails['remoteStatus']) == 0 and msg is None: - flags |= Message.IS_NOT_ACCUSED + flags |= Message.IS_NOT_RECEIVED else: - flags |= Message.IS_ACCUSED + flags |= Message.IS_RECEIVED signature = u'' if mail.get('src', None): diff --git a/weboob/applications/boobmsg/boobmsg.py b/weboob/applications/boobmsg/boobmsg.py index 0b270f43..93506956 100644 --- a/weboob/applications/boobmsg/boobmsg.py +++ b/weboob/applications/boobmsg/boobmsg.py @@ -134,9 +134,9 @@ class MessagesListFormatter(IFormatter): flags += 'N' else: flags += '-' - if message.flags & message.IS_NOT_ACCUSED: + if message.flags & message.IS_NOT_RECEIVED: flags += 'U' - elif message.flags & message.IS_ACCUSED: + elif message.flags & message.IS_RECEIVED: flags += 'R' else: flags += '-' diff --git a/weboob/applications/qboobmsg/messages_manager.py b/weboob/applications/qboobmsg/messages_manager.py index 24f984c1..dc73098f 100644 --- a/weboob/applications/qboobmsg/messages_manager.py +++ b/weboob/applications/qboobmsg/messages_manager.py @@ -180,9 +180,9 @@ class MessagesManager(QWidget): content = message.content.replace('&', '&').replace('<', '<').replace('>', '>').replace('\n', '
') extra = u'' - if message.flags & message.IS_NOT_ACCUSED: + if message.flags & message.IS_NOT_RECEIVED: extra += u'Status: Unread
' - elif message.flags & message.IS_ACCUSED: + elif message.flags & message.IS_RECEIVED: extra += u'Status: Read
' elif message.flags & message.IS_UNREAD: extra += u'Status: New
' diff --git a/weboob/applications/qhavesex/contacts.py b/weboob/applications/qhavesex/contacts.py index c102d1bc..32233855 100644 --- a/weboob/applications/qhavesex/contacts.py +++ b/weboob/applications/qhavesex/contacts.py @@ -54,9 +54,9 @@ class ThreadMessage(QFrame): self.ui.nameLabel.setText(message.sender) header = time.strftime('%Y-%m-%d %H:%M:%S', message.date.timetuple()) - if message.flags & message.IS_NOT_ACCUSED: + if message.flags & message.IS_NOT_RECEIVED: header += u' — Unread' - elif message.flags & message.IS_ACCUSED: + elif message.flags & message.IS_RECEIVED: header += u' — Read' self.ui.headerLabel.setText(header) if message.flags & message.IS_HTML: diff --git a/weboob/capabilities/messages.py b/weboob/capabilities/messages.py index e813326c..624d663c 100644 --- a/weboob/capabilities/messages.py +++ b/weboob/capabilities/messages.py @@ -30,8 +30,8 @@ __all__ = ['ICapMessages', 'ICapMessagesPost', 'Message', 'Thread', 'CantSendMes class Message(CapBaseObject): IS_HTML = 0x001 # The content is HTML formatted IS_UNREAD = 0x002 # The message is unread - IS_ACCUSED = 0x004 # The receiver has read this message - IS_NOT_ACCUSED = 0x008 # The receiver has not read this message + IS_RECEIVED = 0x004 # The receiver has read this message + IS_NOT_RECEIVED = 0x008 # The receiver has not read this message def __init__(self, thread, id, title=NotLoaded,