Author: steve-e Date: 2007-12-27 23:28:40 +0100 (Thu, 27 Dec 2007) New Revision: 9205

Modified: trunk/src/common/xmpp/transports_nb.py trunk/src/dialogs.py Log: Improving readability (little) by shifting some boolean checks to a lambda function.

Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2007-12-27 21:52:45 UTC (rev 9204) +++ trunk/src/common/xmpp/transports_nb.py 2007-12-27 22:28:40 UTC (rev 9205) @@ -1030,7 +1030,7 @@ # use the IPv4 address request even if remote resolving was specified. try: self.ipaddr = socket.inet_aton(self.server[0]) - req = req + "\x01" + ipaddr + req = req + "\x01" + self.ipaddr except socket.error: # Well it's not an IP number, so it's probably a DNS name. # if self.__proxy[3]==True:

Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-12-27 21:52:45 UTC (rev 9204) +++ trunk/src/dialogs.py 2007-12-27 22:28:40 UTC (rev 9205) @@ -3536,6 +3536,15 @@

self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE)

+ # All contacts beside the following can be invited: + # transports, zeroconf contacts, minimized groupchats + invitable = lambda contact, contact_transport = None:\ + contact.jid not in self.auto_jids and\ + contact.jid != gajim.get_jid_from_account(self.account) and\ + contact.jid not in gajim.interface.minimized_controls[account] and\ + not contact.is_transport() and\ + not contact_transport + # set jabber id and pseudos for account in gajim.contacts.get_accounts(): if gajim.connections[account].is_zeroconf: @@ -3544,24 +3553,20 @@ contact = \ gajim.contacts.get_contact_with_highest_priority(account, jid) contact_transport = gajim.get_transport_name_from_jid(jid) - # do not add transports, zeroconf contacs, minimized groupchats - # and selfjid to list of invitable jids - if contact.jid not in self.auto_jids and contact.jid != \ - gajim.get_jid_from_account(self.account) and not contact_transport \ - and not contact.is_transport() and contact.jid not in \ - gajim.interface.minimized_controls[account]: - if contact.show not in ('offline', 'error'): - img = gajim.interface.roster.jabber_state_images['16'][ - contact.show] - name = contact.name - if name == '': - name = jid.split('@')[0] - iter = self.store.append([img.get_pixbuf(), name, jid]) - # preselect treeview rows - if self.preselected_jids and jid in self.preselected_jids: - path = self.store.get_path(iter) - self.guests_treeview.get_selection().\ - select_path(path) + # Add contact if it can be invited + if invitable(contact, contact_transport) and \ + contact.show not in ('offline', 'error'): + img = gajim.interface.roster.jabber_state_images['16'][ + contact.show] + name = contact.name + if name == '': + name = jid.split('@')[0] + iter = self.store.append([img.get_pixbuf(), name, jid]) + # preselect treeview rows + if self.preselected_jids and jid in self.preselected_jids: + path = self.store.get_path(iter) + self.guests_treeview.get_selection().\ + select_path(path)

# show all self.window.show_all() @@ -3579,7 +3584,6 @@ server = self.server_list_comboboxentry.get_active_text() if server == '': return - room_id = gajim.nicks[self.account] + str(randrange(9999999)) gajim.connections[self.account].check_unique_room_id_support(server, self)

def unique_room_id_supported(self, server, room_id):