summaryrefslogtreecommitdiff
path: root/src/tabs
diff options
context:
space:
mode:
Diffstat (limited to 'src/tabs')
-rw-r--r--src/tabs/conversationtab.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tabs/conversationtab.py b/src/tabs/conversationtab.py
index 21c858fd..5e9734d5 100644
--- a/src/tabs/conversationtab.py
+++ b/src/tabs/conversationtab.py
@@ -393,14 +393,17 @@ class DynamicConversationTab(ConversationTab):
self.unlock()
self.refresh_info_header()
- def unlock(self):
+ def unlock(self, from_=None):
"""
Unlock the tab from a resource. It is now “associated” with the bare
jid.
"""
if self.locked_resource != None:
self.locked_resource = None
- self.add_message(_('Conversation unlocked.'), typ=0)
+ if from_:
+ self.add_message(_('Conversation unlocked (received activity from %s).') % from_, typ=0)
+ else:
+ self.add_message(_('Conversation unlocked.'), typ=0)
def get_dest_jid(self):
"""