From a7a0a108b67c7f77cb2a1c388e86b634c1f03c20 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Tue, 13 Aug 2013 01:10:59 +0400 Subject: [PATCH] Fix invite menu. Fixes #7422 --- src/gui_menu_builder.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui_menu_builder.py b/src/gui_menu_builder.py index a1db55acf..d16f73a25 100644 --- a/src/gui_menu_builder.py +++ b/src/gui_menu_builder.py @@ -118,7 +118,6 @@ def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[]): 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 @@ def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[]): 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 @@ def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[]): 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):