From fc007fc68f5eefbdc280d126357c00e57908eb63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Fri, 16 Feb 2018 20:55:28 +0100
Subject: [PATCH] StatusIcon: Set account name correctly
Fixes #8901
---
gajim/statusicon.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gajim/statusicon.py b/gajim/statusicon.py
index d2d47d0dc5..93739873b4 100644
--- a/gajim/statusicon.py
+++ b/gajim/statusicon.py
@@ -244,10 +244,12 @@ class StatusIcon:
self.popup_menus.append(account_menu_for_chat_with)
for account in accounts_list:
+ account_label = app.config.get_per(
+ 'accounts', account, 'account_label')
if app.account_is_connected(account):
# for chat_with
item = Gtk.MenuItem.new_with_label(
- _('using account %s') % account)
+ _('using account %s') % account_label)
account_menu_for_chat_with.append(item)
item.connect('activate', self.on_new_chat, account)
@@ -288,6 +290,8 @@ class StatusIcon:
self.popup_menus.append(account_menu_for_single_message)
for account in accounts_list:
+ account_label = app.config.get_per(
+ 'accounts', account, 'account_label')
if app.connections[account].is_zeroconf or \
not app.account_is_connected(account):
continue
@@ -295,14 +299,14 @@ class StatusIcon:
connected_accounts_with_private_storage += 1
# for single message
item = Gtk.MenuItem.new_with_label(
- _('using account %s') % account)
+ _('using account %s') % account_label)
item.connect('activate',
self.on_single_message_menuitem_activate, account)
account_menu_for_single_message.append(item)
# join gc
gc_item = Gtk.MenuItem.new_with_label(
- _('using account %s') % account)
+ _('using account %s') % account_label)
gc_sub_menu.append(gc_item)
gc_menuitem_menu = Gtk.Menu()
app.interface.roster.add_bookmarks_list(gc_menuitem_menu,
--
GitLab