From 5c9dd440377ebcd682bc6a2cae1e9466813a476d Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 23 Mar 2014 00:47:05 +0100 Subject: Add jid info to the unlock messages --- src/tabs/conversationtab.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/tabs') 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): """ -- cgit v1.2.3