From 99be1b14f27bbf2cfe168e6501e563054ebb10c3 Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Wed, 22 Aug 2007 00:50:48 +0000 Subject: [PATCH] chat2muc: See #2095 Remove ancient menuitem. Do not allow to invite transports and groupchats. Include contacts from all accounts. --- src/chat_control.py | 3 --- src/dialogs.py | 22 +++++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index ad7ada79a..1aa71593d 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1562,9 +1562,6 @@ class ChatControl(ChatControlBase): else: 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 if gajim.get_transport_name_from_jid(jid): convert_to_gc_menuitem.set_sensitive(False) diff --git a/src/dialogs.py b/src/dialogs.py index 287048661..d6e7e1134 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -3258,15 +3258,19 @@ class TransformChatToMUC: self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) # set jabber id and pseudos - for jid in gajim.contacts.get_jid_list(self.account): - contact = \ - gajim.contacts.get_contact_with_highest_priority(self.account, jid) - if contact.jid not in self.auto_jids: - if contact.show not in ('offline', 'error'): - name = contact.name - if name == '': - name = jid.split('@')[0] - self.store.append([name, jid]) + for account in gajim.contacts.get_accounts(): + for jid in gajim.contacts.get_jid_list(account): + contact = \ + gajim.contacts.get_contact_with_highest_priority(account, jid) + contact_transport = gajim.get_transport_name_from_jid(jid) + if contact.jid not in self.auto_jids and \ + not contact_transport and \ + contact.jid not in gajim.interface.minimized_controls[account]: + if contact.show not in ('offline', 'error'): + name = contact.name + if name == '': + name = jid.split('@')[0] + self.store.append([name, jid]) # show all but... self.window.show_all()