changeset da85ddd405c2 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=da85ddd405c2
description: [Kaini] fix start chat menuitem with zeroconf account
diffstat:
src/roster_window.py | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diffs (34 lines):
diff -r cc570eefd2a4 -r da85ddd405c2 src/roster_window.py
--- a/src/roster_window.py Wed Oct 20 21:53:36 2010 +0200
+++ b/src/roster_window.py Thu Oct 21 19:49:58 2010 +0200
@@ -4863,12 +4863,15 @@
# items that get shown whether an account is zeroconf or not
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()
for account in accounts_list:
- if gajim.connections[account].connected <= 1:
- # if offline or connecting
+ if gajim.connections[account].connected <= 1 or \
+ gajim.config.get_per('accounts', account, 'is_zeroconf'):
+ # if offline or connecting or zeroconf
continue
# new chat
@@ -4977,8 +4980,9 @@
for account in gajim.connections:
if gajim.account_is_connected(account) and \
gajim.connections[account].is_zeroconf:
- for item in (join_gc_menuitem,
add_new_contact_menuitem,
- service_disco_menuitem, single_message_menuitem):
+ for item in (new_chat_menuitem, join_gc_menuitem,
+ add_new_contact_menuitem, service_disco_menuitem,
+ single_message_menuitem):
item.set_sensitive(False)
# Manage GC bookmarks
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
