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

* Don't hide manage GC Bookmark menuitem when the server doesn't support private storage

Browse source 
* Fix indentation problem
 * Use generators instead of list comprehension (take less memory)
This commit is contained in:
Stephan Erb 2008-08-25 19:35:47 +00:00
parent 7785d09864
commit f55651d905
2 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/roster_window.py
View file

@ -4707,23 +4707,20 @@ class RosterWindow:
single_message_menuitem]: single_message_menuitem]:
item.set_sensitive(False) item.set_sensitive(False)
else: # we have one or more connected accounts else: # we have one or more connected accounts
for item in [new_chat_menuitem, join_gc_menuitem,\ for item in (new_chat_menuitem, join_gc_menuitem,
add_new_contact_menuitem, service_disco_menuitem,\ add_new_contact_menuitem, service_disco_menuitem,
single_message_menuitem]: single_message_menuitem):
item.set_sensitive(True) item.set_sensitive(True)
# disable some fields if only local account is there # disable some fields if only local account is there
if connected_accounts == 1: if connected_accounts == 1:
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,\ for item in (join_gc_menuitem, add_new_contact_menuitem,
add_new_contact_menuitem, service_disco_menuitem, service_disco_menuitem, single_message_menuitem):
single_message_menuitem]:
item.set_sensitive(False) item.set_sensitive(False)
if connected_accounts_with_private_storage > 0: # Manage GC bookmarks
# At least one account with private storage support
# show the 'manage gc bookmarks' item
newitem = gtk.SeparatorMenuItem() # separator newitem = gtk.SeparatorMenuItem() # separator
gc_sub_menu.append(newitem) gc_sub_menu.append(newitem)
@ -4731,10 +4728,11 @@ class RosterWindow:
img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES,
gtk.ICON_SIZE_MENU) gtk.ICON_SIZE_MENU)
newitem.set_image(img) newitem.set_image(img)
newitem.connect('activate', newitem.connect('activate', self.on_manage_bookmarks_menuitem_activate)
self.on_manage_bookmarks_menuitem_activate)
gc_sub_menu.append(newitem) gc_sub_menu.append(newitem)
gc_sub_menu.show_all() gc_sub_menu.show_all()
if connected_accounts_with_private_storage == 0:
newitem.set_sensitive(False)
connected_accounts_with_vcard = [] connected_accounts_with_vcard = []
for account in gajim.connections: for account in gajim.connections: