copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

StatusIcon: Set account name correctly

Browse source 
Fixes #8901
This commit is contained in:
Philipp Hörist 2018-02-16 20:55:28 +01:00
parent 075ceacf49
commit fc007fc68f
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gajim/statusicon.py
View file

@ -244,10 +244,12 @@ class StatusIcon:
self.popup_menus.append(account_menu_for_chat_with) self.popup_menus.append(account_menu_for_chat_with)
for account in accounts_list: for account in accounts_list:
account_label = app.config.get_per(
'accounts', account, 'account_label')
if app.account_is_connected(account): if app.account_is_connected(account):
# for chat_with # for chat_with
item = Gtk.MenuItem.new_with_label( item = Gtk.MenuItem.new_with_label(
_('using account %s') % account) _('using account %s') % account_label)
account_menu_for_chat_with.append(item) account_menu_for_chat_with.append(item)
item.connect('activate', self.on_new_chat, account) item.connect('activate', self.on_new_chat, account)
@ -288,6 +290,8 @@ class StatusIcon:
self.popup_menus.append(account_menu_for_single_message) self.popup_menus.append(account_menu_for_single_message)
for account in accounts_list: for account in accounts_list:
account_label = app.config.get_per(
'accounts', account, 'account_label')
if app.connections[account].is_zeroconf or \ if app.connections[account].is_zeroconf or \
not app.account_is_connected(account): not app.account_is_connected(account):
continue continue
@ -295,14 +299,14 @@ class StatusIcon:
connected_accounts_with_private_storage += 1 connected_accounts_with_private_storage += 1
# for single message # for single message
item = Gtk.MenuItem.new_with_label( item = Gtk.MenuItem.new_with_label(
_('using account %s') % account) _('using account %s') % account_label)
item.connect('activate', item.connect('activate',
self.on_single_message_menuitem_activate, account) self.on_single_message_menuitem_activate, account)
account_menu_for_single_message.append(item) account_menu_for_single_message.append(item)
# join gc # join gc
gc_item = Gtk.MenuItem.new_with_label( gc_item = Gtk.MenuItem.new_with_label(
_('using account %s') % account) _('using account %s') % account_label)
gc_sub_menu.append(gc_item) gc_sub_menu.append(gc_item)
gc_menuitem_menu = Gtk.Menu() gc_menuitem_menu = Gtk.Menu()
app.interface.roster.add_bookmarks_list(gc_menuitem_menu, app.interface.roster.add_bookmarks_list(gc_menuitem_menu,