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

send invitation to groupchat to correct resource when inviting self contact. fixes #3799

Browse source
This commit is contained in:
Yann Leboulanger 2008-08-12 09:08:47 +00:00
parent d2669df77b
commit d9544baff1
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/roster_window.py
View file

@ -5864,8 +5864,13 @@ class RosterWindow:
contact_list, account, self.on_invite_to_new_room, cap=NS_MUC)) contact_list, account, self.on_invite_to_new_room, cap=NS_MUC))
elif len(list_) == 1 and gajim.capscache.is_supported(contact, NS_MUC): elif len(list_) == 1 and gajim.capscache.is_supported(contact, NS_MUC):
invite_menuitem.set_sensitive(True) invite_menuitem.set_sensitive(True)
# use resource if it's self contact
if contact.jid == gajim.get_jid_from_account(account):
resource = contact.resource
else:
resource = None
invite_to_new_room_menuitem.connect('activate', invite_to_new_room_menuitem.connect('activate',
self.on_invite_to_new_room, list_) self.on_invite_to_new_room, list_, resource)
else: else:
invite_menuitem.set_sensitive(False) invite_menuitem.set_sensitive(False)
# transform None in 'jabber' # transform None in 'jabber'
@ -5901,8 +5906,13 @@ class RosterWindow:
contact_list, account, self.on_invite_to_room, room_jid, contact_list, account, self.on_invite_to_room, room_jid,
account)) account))
else: else:
# use resource if it's self contact
if contact.jid == gajim.get_jid_from_account(account):
resource = contact.resource
else:
resource = None
menuitem.connect('activate', self.on_invite_to_room, list_, menuitem.connect('activate', self.on_invite_to_room, list_,
room_jid, account) room_jid, account, resource)
invite_to_submenu.append(menuitem) invite_to_submenu.append(menuitem)
def get_and_connect_advanced_menuitem_menu(self, account): def get_and_connect_advanced_menuitem_menu(self, account):