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

chat2muc: See #2095

Browse source 
Remove ancient menuitem.
Do not allow to invite transports and groupchats.
Include contacts from all accounts.
This commit is contained in:
Stephan Erb 2007-08-22 00:50:48 +00:00
parent 7b45c9c8f0
commit 99be1b14f2
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/chat_control.py
View file

@ -1562,9 +1562,6 @@ class ChatControl(ChatControlBase):
else: else:
send_file_menuitem.set_sensitive(False) send_file_menuitem.set_sensitive(False)
# compact_view_menuitem
compact_view_menuitem.set_active(self.hide_chat_buttons_current)
# check if it's possible to convert to groupchat # check if it's possible to convert to groupchat
if gajim.get_transport_name_from_jid(jid): if gajim.get_transport_name_from_jid(jid):
convert_to_gc_menuitem.set_sensitive(False) convert_to_gc_menuitem.set_sensitive(False)

22
src/dialogs.py
View file

@ -3258,15 +3258,19 @@ class TransformChatToMUC:
self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
# set jabber id and pseudos # set jabber id and pseudos
for jid in gajim.contacts.get_jid_list(self.account): for account in gajim.contacts.get_accounts():
contact = \ for jid in gajim.contacts.get_jid_list(account):
gajim.contacts.get_contact_with_highest_priority(self.account, jid) contact = \
if contact.jid not in self.auto_jids: gajim.contacts.get_contact_with_highest_priority(account, jid)
if contact.show not in ('offline', 'error'): contact_transport = gajim.get_transport_name_from_jid(jid)
name = contact.name if contact.jid not in self.auto_jids and \
if name == '': not contact_transport and \
name = jid.split('@')[0] contact.jid not in gajim.interface.minimized_controls[account]:
self.store.append([name, jid]) if contact.show not in ('offline', 'error'):
name = contact.name
if name == '':
name = jid.split('@')[0]
self.store.append([name, jid])
# show all but... # show all but...
self.window.show_all() self.window.show_all()