changeset 2a3a84d4a33d in /home/hg/repos/gajim
author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2a3a84d4a33d description: force sending muc invitation to the jid/resource if we're chatting with a specific resource. Fixes #7582
diffstat:
src/gui_menu_builder.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
diffs (39 lines):
diff -r 4ce454f980c5 -r 2a3a84d4a33d src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Jan 07 19:51:56 2014 +0100 +++ b/src/gui_menu_builder.py Mon Jan 13 20:25:07 2014 +0100 @@ -64,9 +64,11 @@ return sub_menu
def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[], -show_bookmarked=False): +show_bookmarked=False, force_resource=False): """ list_ in a list of (contact, account) + force_resource means we want to send invitation even if there is only one + resource """ roster = gajim.interface.roster # used if we invite only one contact with several resources @@ -104,7 +106,7 @@ elif len(list_) == 1 and contact.supports(NS_MUC): invite_menuitem.set_sensitive(True) # use resource if it's self contact - if contact.jid == gajim.get_jid_from_account(account): + if contact.jid == gajim.get_jid_from_account(account) or force_resource: resource = contact.resource else: resource = None @@ -455,8 +457,12 @@ build_invite_submenu(invite_menuitem, [(gc_contact, account)], show_bookmarked=bookmarked) else: + force_resource = False + if control and control.resource: + force_resource = True build_invite_submenu(invite_menuitem, [(contact, account)], - show_bookmarked=contact.supports(NS_CONFERENCE)) + show_bookmarked=contact.supports(NS_CONFERENCE), + force_resource=force_resource)
if gajim.account_is_disconnected(account): invite_menuitem.set_sensitive(False)