summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-12-12 20:31:05 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-12-12 20:31:05 +0100
commita6b1a1d4d8dc2523d1764a55a924566591232a31 (patch)
tree86ebc50d3e7043400715d83c1a449571a9be5daa
parentdf6a8a0cc3b1543775bdb4e3d56dc5772b0653de (diff)
downloadpoezio-a6b1a1d4d8dc2523d1764a55a924566591232a31.tar.gz
poezio-a6b1a1d4d8dc2523d1764a55a924566591232a31.tar.bz2
poezio-a6b1a1d4d8dc2523d1764a55a924566591232a31.tar.xz
poezio-a6b1a1d4d8dc2523d1764a55a924566591232a31.zip
ALWAYS display affiliation or role changes, in MucTabs. fixes #2309
-rw-r--r--src/tabs.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tabs.py b/src/tabs.py
index 661b4112..e696f46d 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -1239,14 +1239,17 @@ class MucTab(ChatTab):
hide_status_change = config.get_by_tabname('hide_status_change', -1, self.general_jid, True)
if hide_status_change < -1:
hide_status_change = -1
- if (hide_status_change == -1 or \
+ if ((hide_status_change == -1 or \
user.has_talked_since(hide_status_change) or\
user.nick == self.own_nick)\
and\
(affiliation != user.affiliation or\
role != user.role or\
show != user.show or\
- status != user.status):
+ status != user.status))\
+ or\
+ (affiliation != user.affiliation or\
+ role != user.role):
# display the message in the room
self._text_buffer.add_message(msg)
self.core.on_user_changed_status_in_private('%s/%s' % (from_room, from_nick), msg)