when we open a tab that require account name to be displayed (another tab with the same nick is opened), we now redraw first tab too so that account is displayed there too. Fixes #2371
This commit is contained in:
parent
910afa2b47
commit
5b2e68d52c
|
@ -863,6 +863,8 @@ class ChatControl(ChatControlBase):
|
||||||
self.update_ui()
|
self.update_ui()
|
||||||
# restore previous conversation
|
# restore previous conversation
|
||||||
self.restore_conversation()
|
self.restore_conversation()
|
||||||
|
# is account displayed after nick in banner ?
|
||||||
|
self.account_displayed= False
|
||||||
|
|
||||||
def notify_on_new_messages(self):
|
def notify_on_new_messages(self):
|
||||||
return gajim.config.get('trayicon_notification_on_new_messages')
|
return gajim.config.get('trayicon_notification_on_new_messages')
|
||||||
|
@ -996,11 +998,16 @@ class ChatControl(ChatControlBase):
|
||||||
# with the same nick we need to also display the account
|
# with the same nick we need to also display the account
|
||||||
# except if we are talking to two different resources of the same contact
|
# except if we are talking to two different resources of the same contact
|
||||||
acct_info = ''
|
acct_info = ''
|
||||||
|
self.account_displayed = False
|
||||||
for ctrl in self.parent_win.controls():
|
for ctrl in self.parent_win.controls():
|
||||||
if ctrl == self:
|
if ctrl == self:
|
||||||
continue
|
continue
|
||||||
if self.contact.get_shown_name() == ctrl.contact.get_shown_name()\
|
if self.contact.get_shown_name() == ctrl.contact.get_shown_name()\
|
||||||
and not avoid_showing_account_too:
|
and not avoid_showing_account_too:
|
||||||
|
self.account_displayed = True
|
||||||
|
if not ctrl.account_displayed:
|
||||||
|
# do that after this instance exists
|
||||||
|
gobject.idle_add(ctrl.draw_banner)
|
||||||
acct_info = ' (%s)' % \
|
acct_info = ' (%s)' % \
|
||||||
gtkgui_helpers.escape_for_pango_markup(self.account)
|
gtkgui_helpers.escape_for_pango_markup(self.account)
|
||||||
break
|
break
|
||||||
|
|
Loading…
Reference in New Issue