summaryrefslogtreecommitdiff
path: root/src/gui.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui.py')
-rw-r--r--src/gui.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui.py b/src/gui.py
index 26fd2506..543029ec 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -429,13 +429,15 @@ class Gui(object):
status = stanza.getStatus()
role = stanza.getRole()
if not room.joined: # user in the room BEFORE us.
- room.users.append(User(from_nick, affiliation, show, status,
- role))
- if from_nick.encode('utf-8') == room.own_nick:
- room.joined = True
- self.add_message_to_room(room, _("Your nickname is %s") % (from_nick))
- else:
- self.add_message_to_room(room, _("%s is in the room") % (from_nick))
+ # ignore redondant presence message, see bug #1509
+ if from_nick not in [user.nick for user in room.users]:
+ room.users.append(User(from_nick, affiliation, show, status,
+ role))
+ if from_nick.encode('utf-8') == room.own_nick:
+ room.joined = True
+ self.add_message_to_room(room, _("Your nickname is %s") % (from_nick))
+ else:
+ self.add_message_to_room(room, _("%s is in the room") % (from_nick))
else:
change_nick = stanza.getStatusCode() == '303'
kick = stanza.getStatusCode() == '307'