merge
This commit is contained in:
commit
195d461a86
1 changed files with 2 additions and 6 deletions
|
@ -1125,22 +1125,18 @@ class PrivateTab(ChatTab):
|
||||||
"""
|
"""
|
||||||
The user left the associated MUC
|
The user left the associated MUC
|
||||||
"""
|
"""
|
||||||
|
self.deactivate()
|
||||||
if not status_message:
|
if not status_message:
|
||||||
self.get_room().add_message(_('\x191%(spec)s \x193%(nick)s\x195 has left the room') % {'nick':from_nick.replace('"', '\\"'), 'spec':theme.CHAR_QUIT.replace('"', '\\"')})
|
self.get_room().add_message(_('\x191%(spec)s \x193%(nick)s\x195 has left the room') % {'nick':from_nick.replace('"', '\\"'), 'spec':theme.CHAR_QUIT.replace('"', '\\"')})
|
||||||
else:
|
else:
|
||||||
self.get_room().add_message(_('\x191%(spec)s \x193%(nick)s\x195 has left the room (%(status)s)"') % {'nick':from_nick.replace('"', '\\"'), 'spec':theme.CHAR_QUIT, 'status': status_message.replace('"', '\\"')})
|
self.get_room().add_message(_('\x191%(spec)s \x193%(nick)s\x195 has left the room (%(status)s)"') % {'nick':from_nick.replace('"', '\\"'), 'spec':theme.CHAR_QUIT, 'status': status_message.replace('"', '\\"')})
|
||||||
self.deactivate()
|
|
||||||
self.refresh()
|
|
||||||
self.core.doupdate()
|
|
||||||
|
|
||||||
def user_rejoined(self, nick):
|
def user_rejoined(self, nick):
|
||||||
"""
|
"""
|
||||||
The user (or at least someone with the same nick) came back in the MUC
|
The user (or at least someone with the same nick) came back in the MUC
|
||||||
"""
|
"""
|
||||||
self.get_room().add_message('\x194%(spec)s \x193%(nick)s\x195 joined the room' % {'nick':nick, 'spec':theme.CHAR_JOIN})
|
|
||||||
self.activate()
|
self.activate()
|
||||||
self.refresh()
|
self.get_room().add_message('\x194%(spec)s \x193%(nick)s\x195 joined the room' % {'nick':nick, 'spec':theme.CHAR_JOIN})
|
||||||
self.core.doupdate()
|
|
||||||
|
|
||||||
def activate(self):
|
def activate(self):
|
||||||
self.on = True
|
self.on = True
|
||||||
|
|
Loading…
Reference in a new issue