comparison src/browser/sat_browser/menu.py @ 698:f1271f769ffd

browser_side: don't open a new tab when inviting people to a MUC we already joined
author souliane <souliane@mailoo.org>
date Mon, 20 Apr 2015 09:52:22 +0200
parents 76a67d04c63e
children ad733b670cc3
comparison
equal deleted inserted replaced
697:b395d1309936 698:f1271f769ffd
90 contact_list = self.host.contact_list 90 contact_list = self.host.contact_list
91 if room_jid is None or room_jid not in contact_list.getSpecials(C.CONTACT_SPECIAL_GROUP): 91 if room_jid is None or room_jid not in contact_list.getSpecials(C.CONTACT_SPECIAL_GROUP):
92 room_jid_s = unicode(room_jid) if room_jid else '' 92 room_jid_s = unicode(room_jid) if room_jid else ''
93 self.host.bridge.joinMUC(room_jid_s, nick, profile=C.PROF_KEY_NONE, callback=lambda room_jid: invite(room_jid, contacts), errback=self.host.showFailureRoomInvalid) 93 self.host.bridge.joinMUC(room_jid_s, nick, profile=C.PROF_KEY_NONE, callback=lambda room_jid: invite(room_jid, contacts), errback=self.host.showFailureRoomInvalid)
94 else: 94 else:
95 self.host.displayWidget(chat.Chat, room_jid, type_="group", new_tab=room_jid) 95 self.host.displayWidget(chat.Chat, room_jid, type_="group")
96 invite(room_jid, contacts) 96 invite(room_jid, contacts)
97 97
98 dialog.RoomAndContactsChooser(self.host, join, ok_button="Join", visible=(True, False)) 98 dialog.RoomAndContactsChooser(self.host, join, ok_button="Join", visible=(True, False))
99 99
100 100