changeset 6bee0dc9cc78 in /home/hg/repos/gajim
branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6bee0dc9cc78 description: Fix invite menu. Fixes #7422
diffstat:
src/gui_menu_builder.py | 7 +++---- 1 файлов изменено, 3 вставок(+), 4 удалений(-)
различия (31 строк):
diff -r 780f5fbe62e0 -r 6bee0dc9cc78 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Aug 13 01:07:47 2013 +0400 +++ b/src/gui_menu_builder.py Tue Aug 13 01:10:59 2013 +0400 @@ -118,7 +118,6 @@ invite_to_new_room_menuitem.set_sensitive(False) rooms = [] # a list of (room_jid, account) tuple invite_to_submenu.append(invite_to_new_room_menuitem) - rooms = [] # a list of (room_jid, account) tuple minimized_controls = [] for account in connected_accounts: minimized_controls += \ @@ -133,7 +132,7 @@ continue if room_jid in gajim.gc_connected[acct] and \ gajim.gc_connected[acct][room_jid] and \ - contacts_transport == gajim.get_transport_name_from_jid(room_jid): + contacts_transport in ['jabber', None]: rooms.append((room_jid, acct)) if len(rooms): item = gtk.SeparatorMenuItem() # separator @@ -142,8 +141,8 @@ menuitem = gtk.MenuItem(room_jid.split('@')[0]) if len(contact_list) > 1: # several resources menuitem.set_submenu(build_resources_submenu( - contact_list, account, roster.on_invite_to_room, room_jid, - account)) + contact_list, account, roster.on_invite_to_room, room_jid, + account)) else: # use resource if it's self contact if contact.jid == gajim.get_jid_from_account(account):