pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle subject with no nick. And avoid duplicates

Browse source
This commit is contained in:
louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 2011-01-09 01:54:36 +00:00
parent cfc3309009
commit 3ef50faf76
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core.py
View file

@ -848,7 +848,10 @@ class Core(object):
subject = message['subject'] subject = message['subject']
if not subject: if not subject:
return return
self.add_message_to_text_buffer(room, _("%(nick)s set the subject to: %(subject)s") % {'nick':nick_from, 'subject':subject}, time=None) if nick_from:
self.add_message_to_text_buffer(room, _("%(nick)s set the subject to: %(subject)s") % {'nick':nick_from, 'subject':subject}, time=None)
else:
self.add_message_to_text_buffer(room, _("The subject is: %(subject)s") % {'subject':subject}, time=None)
room.topic = subject.replace('\n', '|') room.topic = subject.replace('\n', '|')
self.refresh_window() self.refresh_window()
@ -856,6 +859,8 @@ class Core(object):
""" """
Triggered whenever a message is received from a multi-user chat room. Triggered whenever a message is received from a multi-user chat room.
""" """
if message['subject']:
return
delay_tag = message.find('{urn:xmpp:delay}delay') delay_tag = message.find('{urn:xmpp:delay}delay')
if delay_tag is not None: if delay_tag is not None:
delayed = True delayed = True