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

when we select multiple accounts, look into all of them which transport support MUC to enable the New Room in invite submenu. Fixes #2199

Browse source
This commit is contained in:
Yann Leboulanger 2006-08-01 21:21:53 +00:00
parent f3297666b7
commit f496059862
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/roster_window.py
View file

@ -1414,7 +1414,7 @@ class RosterWindow:
menuitem.connect('activate', self.on_invite_to_new_room, [(contact, menuitem.connect('activate', self.on_invite_to_new_room, [(contact,
account)]) account)])
contact_transport = gajim.get_transport_name_from_jid(contact.jid) contact_transport = gajim.get_transport_name_from_jid(contact.jid)
t = contact_transport or 'jabber' t = contact_transport or 'jabber' # transform None in 'jabber'
if not gajim.connections[account].muc_jid.has_key(t): if not gajim.connections[account].muc_jid.has_key(t):
menuitem.set_sensitive(False) menuitem.set_sensitive(False)
submenu.append(menuitem) submenu.append(menuitem)
@ -1521,6 +1521,7 @@ class RosterWindow:
jid_list.append(contact.jid) jid_list.append(contact.jid)
if account not in account_list: if account not in account_list:
account_list.append(account) account_list.append(account)
# transform None in 'jabber'
type_ = gajim.get_transport_name_from_jid(jid_list[0]) or 'jabber' type_ = gajim.get_transport_name_from_jid(jid_list[0]) or 'jabber'
for account in account_list: for account in account_list:
if gajim.connections[account].muc_jid[type_]: if gajim.connections[account].muc_jid[type_]:
@ -1586,6 +1587,13 @@ class RosterWindow:
icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU)
menuitem.set_image(icon) menuitem.set_image(icon)
menuitem.connect('activate', self.on_invite_to_new_room, list_) menuitem.connect('activate', self.on_invite_to_new_room, list_)
muc_jid = {}
c_t = contacts_transport or 'jabber' # transform None in 'jabber'
for account in connected_accounts:
for t in gajim.connections[account].muc_jid:
muc_jid[t] = gajim.connections[account].muc_jid[t]
if not muc_jid.has_key(c_t):
menuitem.set_sensitive(False)
sub_menu.append(menuitem) sub_menu.append(menuitem)
rooms = [] # a list of (room_jid, account) tuple rooms = [] # a list of (room_jid, account) tuple
for gc_control in gajim.interface.msg_win_mgr.get_controls( for gc_control in gajim.interface.msg_win_mgr.get_controls(