gajim: ignore attention (XEP-224) when messages is delayed

changeset b8b9eba64513 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b8b9eba64513 description: ignore attention (XEP-224) when messages is delayed

diffstat:

src/common/connection_handlers_events.py | 5 ++++- src/common/protocol/bytestream.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r 50d442d512b5 -r b8b9eba64513 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Mar 09 10:25:26 2014 +0100 +++ b/src/common/connection_handlers_events.py Mon Mar 10 21:47:21 2014 +0100 @@ -1312,7 +1312,10 @@ self.displaymarking = self.seclabel.getTag('displaymarking')

if self.stanza.getTag('attention', namespace=nbxmpp.NS_ATTENTION): - self.attention = True + delayed = self.stanza.getTag('x', namespace=nbxmpp.NS_DELAY) is not\ + None + if not delayed: + self.attention = True

self.form_node = self.stanza.getTag('x', namespace=nbxmpp.NS_DATA)

diff -r 50d442d512b5 -r b8b9eba64513 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Mar 09 10:25:26 2014 +0100 +++ b/src/common/protocol/bytestream.py Mon Mar 10 21:47:21 2014 +0100 @@ -468,6 +468,9 @@ if listener: self._add_streamhosts_to_query(query, sender, ext_port, [ext_ip]) + else: + self._add_streamhosts_to_query(query, file_props.sender, + ext_port, [ext_ip]) self.connection.send(iq) cleanup_gupnp()