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

[Kaini] fix start chat menuitem with zeroconf account

This commit is contained in:
Yann Leboulanger 2010-10-21 19:49:58 +02:00
parent 14071b6fc7
commit 36086dabb4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/roster_window.py
View File

@ -4863,12 +4863,15 @@ class RosterWindow:
# items that get shown whether an account is zeroconf or not # items that get shown whether an account is zeroconf or not
accounts_list = sorted(gajim.contacts.get_accounts()) accounts_list = sorted(gajim.contacts.get_accounts())
if connected_accounts > 1: # 2 or more accounts? make submenus if connected_accounts > 2 or \
(connected_accounts > 1 and not gajim.zeroconf_is_connected()):
# 2 or more "real" (no zeroconf) accounts? make submenus
new_chat_sub_menu = gtk.Menu() new_chat_sub_menu = gtk.Menu()
for account in accounts_list: for account in accounts_list:
if gajim.connections[account].connected <= 1: if gajim.connections[account].connected <= 1 or \
# if offline or connecting gajim.config.get_per('accounts', account, 'is_zeroconf'):
# if offline or connecting or zeroconf
continue continue
# new chat # new chat
@ -4977,8 +4980,9 @@ class RosterWindow:
for account in gajim.connections: for account in gajim.connections:
if gajim.account_is_connected(account) and \ if gajim.account_is_connected(account) and \
gajim.connections[account].is_zeroconf: gajim.connections[account].is_zeroconf:
for item in (join_gc_menuitem, add_new_contact_menuitem, for item in (new_chat_menuitem, join_gc_menuitem,
service_disco_menuitem, single_message_menuitem): add_new_contact_menuitem, service_disco_menuitem,
single_message_menuitem):
item.set_sensitive(False) item.set_sensitive(False)
# Manage GC bookmarks # Manage GC bookmarks