From 9f853cd774d771a0569a3beb27e6a567d782a841 Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 24 Jul 2016 17:59:24 +0200 Subject: [PATCH] quick_frontend, primitivus (chat): fixed widget bad locking + don't send notification when locked --- frontends/src/primitivus/chat.py | 5 +++++ frontends/src/quick_frontend/quick_chat.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frontends/src/primitivus/chat.py b/frontends/src/primitivus/chat.py index 7245711a..09530082 100644 --- a/frontends/src/primitivus/chat.py +++ b/frontends/src/primitivus/chat.py @@ -442,6 +442,11 @@ class Chat(PrimitivusWidget, quick_chat.QuickChat): # notifications + if self._locked: + # we don't want notifications when locked + # because that's history messages + return + if wid.mess_data.mention: from_jid = wid.mess_data.from_jid msg = _(u'You have been mentioned by {nick} in {room}'.format( diff --git a/frontends/src/quick_frontend/quick_chat.py b/frontends/src/quick_frontend/quick_chat.py index a3a46647..3309d9c5 100644 --- a/frontends/src/quick_frontend/quick_chat.py +++ b/frontends/src/quick_frontend/quick_chat.py @@ -153,7 +153,7 @@ class QuickChat(quick_widgets.QuickWidget): """ self.lang = '' # default language to use for messages quick_widgets.QuickWidget.__init__(self, host, target, profiles=profiles) - self._locked = False # True when we are waiting for history/search + self._locked = True # True when we are waiting for history/search # messageNew signals are cached when locked self._cache = [] assert type_ in (C.CHAT_ONE2ONE, C.CHAT_GROUP)