Fix #2534 (display who changed the topic)

This commit is contained in:
mathieui 2014-07-06 00:18:29 +02:00
parent cfd344edc3
commit e0e2123a4b
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3
2 changed files with 6 additions and 2 deletions

View file

@ -972,6 +972,7 @@ def on_groupchat_subject(self, message):
time=None, time=None,
typ=2) typ=2)
tab.topic = subject tab.topic = subject
tab.topic_from = nick_from
if self.get_tab_by_name(room_from, tabs.MucTab) is self.current_tab(): if self.get_tab_by_name(room_from, tabs.MucTab) is self.current_tab():
self.refresh_window() self.refresh_window()

View file

@ -65,6 +65,7 @@ class MucTab(ChatTab):
self.users = [] self.users = []
self.privates = [] # private conversations self.privates = [] # private conversations
self.topic = '' self.topic = ''
self.topic_from = ''
self.remote_wants_chatstates = True self.remote_wants_chatstates = True
# We send active, composing and paused states to the MUC because # We send active, composing and paused states to the MUC because
# the chatstate may or may not be filtered by the MUC, # the chatstate may or may not be filtered by the MUC,
@ -533,9 +534,11 @@ class MucTab(ChatTab):
""" """
if not arg.strip(): if not arg.strip():
self._text_buffer.add_message( self._text_buffer.add_message(
_("\x19%s}The subject of the room is: %s") % _("\x19%s}The subject of the room is: %s %s") %
(dump_tuple(get_theme().COLOR_INFORMATION_TEXT), (dump_tuple(get_theme().COLOR_INFORMATION_TEXT),
self.topic)) self.topic,
'(set by %s)' % self.topic_from if self.topic_from
else ''))
self.refresh() self.refresh()
return return
subject = arg subject = arg