Commits January 2009

commits@gajim.org

7 participants
115 discussions

[commit-gajim] r10987 - trunk/src
by asterix＠gajim.org 16 Jan '09

16 Jan '09

Author: asterix Date: 2009-01-16 17:51:20 +0100 (Fri, 16 Jan 2009) New Revision: 10987 Modified: trunk/src/roster_window.py Log: typo (append -> remove). Fixes #4618 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2009-01-16 15:01:36 UTC (rev 10986) +++ trunk/src/roster_window.py 2009-01-16 16:51:20 UTC (rev 10987) @@ -1407,19 +1407,6 @@ self.tree.expand_row(path, False) return False - def _adjust_contact_expand_collapse_state(self, jid, account): - '''Expand/collapse group row based on self.collapsed_rows''' - iterC = self._get_contact_iter(jid, account) - if not iterC: - # Contact not visible - return - path = self.modelfilter.get_path(iterC) - if account + group in self.collapsed_rows: - self.tree.collapse_row(path) - else: - self.tree.expand_row(path, False) - return False - ############################################################################## ### Roster and Modelfilter handling ############################################################################## @@ -3555,7 +3542,7 @@ contact = gajim.contacts.get_contact(account, jid) for group in contact.groups: if account + group + jid in self.collapsed_rows: - self.collapsed_rows.append(account + group + jid) + self.collapsed_rows.remove(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid) nearby_family = \ self._get_nearby_family_and_big_brother(family, account)[0]

1 0

[commit-gajim] r10986 - in trunk/src: . common
by asterix＠gajim.org 16 Jan '09

16 Jan '09

Author: asterix Date: 2009-01-16 16:01:36 +0100 (Fri, 16 Jan 2009) New Revision: 10986 Modified: trunk/src/chat_control.py trunk/src/common/connection.py Log: don't allow to send xhtml when gpg is active (because this part is not encrypted). Fixes #4650 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2009-01-15 17:54:28 UTC (rev 10985) +++ trunk/src/chat_control.py 2009-01-16 15:01:36 UTC (rev 10986) @@ -1232,7 +1232,8 @@ def update_toolbar(self): # Formatting if gajim.capscache.is_supported(self.contact, NS_XHTML_IM) \ - and not gajim.capscache.is_supported(self.contact, 'notexistant'): + and not gajim.capscache.is_supported(self.contact, 'notexistant') \ + and not self.gpg_is_active: self._formattings_button.set_sensitive(True) else: self._formattings_button.set_sensitive(False) Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2009-01-15 17:54:28 UTC (rev 10985) +++ trunk/src/common/connection.py 2009-01-16 15:01:36 UTC (rev 10986) @@ -1162,6 +1162,7 @@ fjid = str(session.jid) if keyID and self.USE_GPG: + xhtml = None if keyID == 'UNKNOWN': error = _('Neither the remote presence is signed, nor a key was assigned.') elif keyID.endswith('MISMATCH'):

1 0

[commit-gajim] r10985 - trunk/src/common/xmpp
by asterix＠gajim.org 15 Jan '09

15 Jan '09

Author: asterix Date: 2009-01-15 18:54:28 +0100 (Thu, 15 Jan 2009) New Revision: 10985 Modified: trunk/src/common/xmpp/tls_nb.py Log: load certificates from /etc/ssl/certs too. Fixes #4633 Modified: trunk/src/common/xmpp/tls_nb.py =================================================================== --- trunk/src/common/xmpp/tls_nb.py 2009-01-15 17:10:11 UTC (rev 10984) +++ trunk/src/common/xmpp/tls_nb.py 2009-01-15 17:54:28 UTC (rev 10985) @@ -299,7 +299,7 @@ else: return False - def _load_user_certs(self, cert_path, cert_store): + def _load_cert_file(self, cert_path, cert_store, logg=True): if not os.path.isfile(cert_path): return f = open(cert_path) @@ -316,11 +316,12 @@ OpenSSL.crypto.FILETYPE_PEM, cert) cert_store.add_cert(x509cert) except OpenSSL.crypto.Error, exception_obj: - log.warning('Unable to load a certificate from file %s: %s' %\ - (self.mycerts, exception_obj.args[0][0][2])) + if logg: + log.warning('Unable to load a certificate from file %s: %s' %\ + (cert_path, exception_obj.args[0][0][2])) except: - log.warning('Unknown error while loading certificate from file%s' - % self.mycerts) + log.warning('Unknown error while loading certificate from file ' + '%s' % cert_path) begin = -1 i += 1 @@ -337,7 +338,14 @@ except: log.warning('Unable to load SSL certificates from file %s' % \ os.path.abspath(self.cacerts)) - self._load_user_certs(self.mycerts, tcpsock._sslContext.get_cert_store()) + store = tcpsock._sslContext.get_cert_store() + self._load_cert_file(self.mycerts, store) + if os.path.isdir('/etc/ssl/certs'): + for f in os.listdir('/etc/ssl/certs'): + # We don't logg because there is a lot a duplicated certs in this + # folder + self._load_cert_file(os.path.join('/etc/ssl/certs', f), store, + logg=False) tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext, tcpsock._sock)

1 0

[commit-gajim] r10984 - trunk
by asterix＠gajim.org 15 Jan '09

15 Jan '09

Author: asterix Date: 2009-01-15 18:10:11 +0100 (Thu, 15 Jan 2009) New Revision: 10984 Modified: trunk/autogen.sh Log: make sure config folder is created when libtool < 2.2.6a. Fixes #4680 Modified: trunk/autogen.sh =================================================================== --- trunk/autogen.sh 2009-01-14 18:14:20 UTC (rev 10983) +++ trunk/autogen.sh 2009-01-15 17:10:11 UTC (rev 10984) @@ -19,6 +19,8 @@ which glibtoolize >/dev/null 2>&1 && LIBTOOLIZE="glibtoolize" || LIBTOOLIZE="libtoolize" + mkdir -p config + intltoolize --force --automake \ && aclocal -I ./m4 \ && $LIBTOOLIZE --copy --force --automake \

1 0

[commit-gajim] r10983 - trunk/src
by asterix＠gajim.org 14 Jan '09

14 Jan '09

Author: asterix Date: 2009-01-14 19:14:20 +0100 (Wed, 14 Jan 2009) New Revision: 10983 Modified: trunk/src/gajim.py Log: connection type in 'plain', not 'tcp' Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-01-14 17:27:53 UTC (rev 10982) +++ trunk/src/gajim.py 2009-01-14 18:14:20 UTC (rev 10983) @@ -2043,7 +2043,7 @@ if is_checked[1]: gajim.config.set_per('accounts', account, 'warn_when_plaintext_connection', False) - gajim.connections[account].connection_accepted(data[0], 'tcp') + gajim.connections[account].connection_accepted(data[0], 'plain') def on_cancel(): del self.instances[account]['online_dialog']['plain_connection'] gajim.connections[account].disconnect(on_purpose=True)

1 0

[commit-gajim] r10982 - trunk/src/common
by asterix＠gajim.org 14 Jan '09

14 Jan '09

Author: asterix Date: 2009-01-14 18:27:53 +0100 (Wed, 14 Jan 2009) New Revision: 10982 Modified: trunk/src/common/resolver.py Log: fix previous commit: missing import and typo Modified: trunk/src/common/resolver.py =================================================================== --- trunk/src/common/resolver.py 2009-01-14 17:24:07 UTC (rev 10981) +++ trunk/src/common/resolver.py 2009-01-14 17:27:53 UTC (rev 10982) @@ -23,6 +23,7 @@ import logging log = logging.getLogger('gajim.c.resolver') +from common import helpers from xmpp.idlequeue import IdleCommand # it is good to check validity of arguments, when calling system commands @@ -238,7 +239,7 @@ elif helpers.decode_string(line).startswith(ufqdn): line = helpers.decode_string(line) domain = ufqdn # For nslookup 9.6 - if domain + if domain: rest = line[len(domain):].split('=') if len(rest) != 2: continue

1 0

[commit-gajim] r10981 - trunk/src/common
by asterix＠gajim.org 14 Jan '09

14 Jan '09

Author: asterix Date: 2009-01-14 18:24:07 +0100 (Wed, 14 Jan 2009) New Revision: 10981 Modified: trunk/src/common/resolver.py Log: reapply patch for nslookup 9.6 that was remove with bosh merge. Fixes #4677 Modified: trunk/src/common/resolver.py =================================================================== --- trunk/src/common/resolver.py 2009-01-14 08:51:07 UTC (rev 10980) +++ trunk/src/common/resolver.py 2009-01-14 17:24:07 UTC (rev 10981) @@ -226,13 +226,20 @@ # _xmpp-client._tcp.jabber.org service = 30 30 5222 jabber.org. if not result: return [] + ufqdn = helpers.ascii_to_idn(fqdn) # Unicode domain name hosts = [] lines = result.split('\n') for line in lines: if line == '': continue + domain = None if line.startswith(fqdn): - rest = line[len(fqdn):].split('=') + domain = fqdn # For nslookup 9.5 + elif helpers.decode_string(line).startswith(ufqdn): + line = helpers.decode_string(line) + domain = ufqdn # For nslookup 9.6 + if domain + rest = line[len(domain):].split('=') if len(rest) != 2: continue answer_type, props_str = rest @@ -250,8 +257,8 @@ port = int(port) except ValueError: continue - hosts.append({'host': host, 'port': port,'weight': weight, - 'prio': prio}) + hosts.append({'host': host, 'port': port, 'weight': weight, + 'prio': prio}) return hosts def _on_ready(self, host, type, result):

1 0

[commit-gajim] r10980 - trunk/src/common/xmpp
by asterix＠gajim.org 14 Jan '09

14 Jan '09

Author: asterix Date: 2009-01-14 09:51:07 +0100 (Wed, 14 Jan 2009) New Revision: 10980 Modified: trunk/src/common/xmpp/auth_nb.py Log: [dwd] better way to encode using base64. Fixes #4568 Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2009-01-13 19:24:09 UTC (rev 10979) +++ trunk/src/common/xmpp/auth_nb.py 2009-01-14 08:51:07 UTC (rev 10980) @@ -212,10 +212,12 @@ self.mechanism = 'DIGEST-MD5' elif 'PLAIN' in self.mecs: self.mecs.remove('PLAIN') - sasl_data='%s\x00%s\x00%s' % (self.username+'@' + self._owner.Server, - self.username, self.password) - node = Node('auth', attrs={'xmlns':NS_SASL,'mechanism':'PLAIN'}, - payload=[base64.encodestring(sasl_data).replace('\n','')]) + sasl_data = u'%s\x00%s\x00%s' % (self.username + '@' + \ + self._owner.Server, self.username, self.password) + sasl_data = sasl_data.encode('utf-8').encode('base64').replace( + '\n','') + node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, + payload=[sasl_data]) self.mechanism = 'PLAIN' else: self.startsasl = SASL_FAILURE @@ -312,16 +314,16 @@ resp['qop'], HH(A2)])) resp['response'] = response resp['charset'] = 'utf-8' - sasl_data = '' + sasl_data = u'' for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop'): if key in ('nc','qop','response','charset'): - sasl_data += "%s=%s," % (key, resp[key]) + sasl_data += u"%s=%s," % (key, resp[key]) else: - sasl_data += '%s="%s",' % (key, resp[key]) - node = Node('response', attrs={'xmlns':NS_SASL}, - payload=[base64.encodestring(sasl_data[:-1]).replace('\r',''). - replace('\n','')]) + sasl_data += u'%s="%s",' % (key, resp[key]) + sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace( + '\r','').replace('\n','') + node = Node('response', attrs={'xmlns':NS_SASL}, payload=[sasl_data]) self._owner.send(str(node)) elif 'rspauth' in chal: self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL})))

1 0

[commit-gajim] r10979 - trunk/src/common
by asterix＠gajim.org 13 Jan '09

13 Jan '09

Author: asterix Date: 2009-01-13 20:24:09 +0100 (Tue, 13 Jan 2009) New Revision: 10979 Modified: trunk/src/common/connection.py Log: save certificate fingerprint when we don't have it. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2009-01-13 19:20:12 UTC (rev 10978) +++ trunk/src/common/connection.py 2009-01-13 19:24:09 UTC (rev 10979) @@ -181,6 +181,7 @@ def put_event(self, ev): if ev[0] in gajim.handlers: + log.debug('Sending %s event to GUI: %s' % (ev[0], ev[1:])) gajim.handlers[ev[0]](self.name, ev[1]) def dispatch(self, event, data): @@ -707,6 +708,9 @@ self.dispatch('FINGERPRINT_ERROR', (con.Connection.ssl_fingerprint_sha1,)) return True + else: + gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', + con.Connection.ssl_fingerprint_sha1) self._register_handlers(con, con_type) con.auth( user=name,

1 0

[commit-gajim] r10978 - trunk/src
by asterix＠gajim.org 13 Jan '09

13 Jan '09

Author: asterix Date: 2009-01-13 20:20:12 +0100 (Tue, 13 Jan 2009) New Revision: 10978 Modified: trunk/src/config.py trunk/src/gajim.py Log: don't allow to have several ssl_error / fingerprint_error / plain_connection / insecure_ssl dialog at the same time for one account. Fixes #4642 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-01-12 17:25:27 UTC (rev 10977) +++ trunk/src/config.py 2009-01-13 19:20:12 UTC (rev 10978) @@ -1810,7 +1810,8 @@ # change account variable for chat / gc controls gajim.interface.msg_win_mgr.change_account_name(old_name, new_name) # upgrade account variable in opened windows - for kind in ('infos', 'disco', 'gc_config', 'search'): + for kind in ('infos', 'disco', 'gc_config', 'search', + 'online_dialog'): for j in gajim.interface.instances[new_name][kind]: gajim.interface.instances[new_name][kind][j].account = \ new_name @@ -2227,7 +2228,7 @@ self.init_account_gpg() # update variables gajim.interface.instances[gajim.ZEROCONF_ACC_NAME] = {'infos': {}, - 'disco': {}, 'gc_config': {}, 'search': {}} + 'disco': {}, 'gc_config': {}, 'search': {}, 'online_dialog': {}} gajim.interface.minimized_controls[gajim.ZEROCONF_ACC_NAME] = {} gajim.connections[gajim.ZEROCONF_ACC_NAME].connected = 0 gajim.groups[gajim.ZEROCONF_ACC_NAME] = {} @@ -3490,7 +3491,7 @@ # update variables gajim.interface.instances[self.account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}} + 'gc_config': {}, 'search': {}, 'online_dialog': {}} gajim.interface.minimized_controls[self.account] = {} gajim.connections[self.account].connected = 0 gajim.connections[self.account].keepalives = gajim.config.get_per( Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-01-12 17:25:27 UTC (rev 10977) +++ trunk/src/gajim.py 2009-01-13 19:20:12 UTC (rev 10978) @@ -598,6 +598,12 @@ def handle_event_status(self, account, status): # OUR status #('STATUS', account, status) model = self.roster.status_combobox.get_model() + if status in ('offline', 'error'): + for name in self.instances[account]['online_dialog'].keys(): + # .keys() is needed to not have a dictionary length changed during + # iteration error + self.instances[account]['online_dialog'][name].destroy() + del self.instances[account]['online_dialog'][name] if status == 'offline': # sensitivity for this menuitem if gajim.get_number_of_connected_accounts() == 0: @@ -1957,6 +1963,7 @@ server = gajim.config.get_per('accounts', account, 'hostname') def on_ok(is_checked): + del self.instances[account]['online_dialog']['ssl_error'] if is_checked[0]: # Check if cert is already in file certs = '' @@ -1983,6 +1990,7 @@ gajim.connections[account].ssl_certificate_accepted() def on_cancel(): + del self.instances[account]['online_dialog']['ssl_error'] gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') @@ -1993,18 +2001,23 @@ else: checktext1 = '' checktext2 = _('Ignore this error for this certificate.') - dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, checktext1, + if 'ssl_error' in self.instances[account]['online_dialog']: + self.instances[account]['online_dialog']['ssl_error'].destroy() + self.instances[account]['online_dialog']['ssl_error'] = \ + dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) def handle_event_fingerprint_error(self, account, data): # ('FINGERPRINT_ERROR', account, (new_fingerprint,)) def on_yes(is_checked): + del self.instances[account]['online_dialog']['fingerprint_error'] gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1', data[0]) # Reset the ignored ssl errors gajim.config.set_per('accounts', account, 'ignore_ssl_errors', '') gajim.connections[account].ssl_certificate_accepted() def on_no(): + del self.instances[account]['online_dialog']['fingerprint_error'] gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') pritext = _('SSL certificate error') @@ -2013,13 +2026,17 @@ '\n\nDo you still want to connect and update the fingerprint of the ' 'certificate?') % {'old': gajim.config.get_per('accounts', account, 'ssl_fingerprint_sha1'), 'new': data[0]} - dialog = dialogs.YesNoDialog(pritext, sectext, on_response_yes=on_yes, + if 'fingerprint_error' in self.instances[account]['online_dialog']: + self.instances[account]['online_dialog']['fingerprint_error'].destroy() + self.instances[account]['online_dialog']['fingerprint_error'] = \ + dialogs.YesNoDialog(pritext, sectext, on_response_yes=on_yes, on_response_no=on_no) def handle_event_plain_connection(self, account, data): # ('PLAIN_CONNECTION', account, (connection)) server = gajim.config.get_per('accounts', account, 'hostname') def on_ok(is_checked): + del self.instances[account]['online_dialog']['plain_connection'] if not is_checked[0]: on_cancel() return @@ -2028,6 +2045,7 @@ 'warn_when_plaintext_connection', False) gajim.connections[account].connection_accepted(data[0], 'tcp') def on_cancel(): + del self.instances[account]['online_dialog']['plain_connection'] gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') pritext = _('Insecure connection') @@ -2035,7 +2053,10 @@ 'connection. Are you sure you want to do that?') checktext1 = _('Yes, I really want to connect insecurely') checktext2 = _('Do _not ask me again') - dialog = dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, + if 'plain_connection' in self.instances[account]['online_dialog']: + self.instances[account]['online_dialog']['plain_connection'].destroy() + self.instances[account]['online_dialog']['plain_connection'] = \ + dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, is_modal=False) @@ -2043,6 +2064,7 @@ # ('INSECURE_SSL_CONNECTION', account, (connection, connection_type)) server = gajim.config.get_per('accounts', account, 'hostname') def on_ok(is_checked): + del self.instances[account]['online_dialog']['insecure_ssl'] if not is_checked[0]: on_cancel() return @@ -2058,6 +2080,7 @@ return gajim.connections[account].connection_accepted(data[0], data[1]) def on_cancel(): + del self.instances[account]['online_dialog']['insecure_ssl'] gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') pritext = _('Insecure connection') @@ -2065,7 +2088,10 @@ 'connection. You should install PyOpenSSL to prevent that. Are you sure you want to do that?') checktext1 = _('Yes, I really want to connect insecurely') checktext2 = _('Do _not ask me again') - dialog = dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, + if 'insecure_ssl' in self.instances[account]['online_dialog']: + self.instances[account]['online_dialog']['insecure_ssl'].destroy() + self.instances[account]['online_dialog']['insecure_ssl'] = \ + dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, is_modal=False) @@ -3137,7 +3163,9 @@ for a in gajim.connections: self.instances[a] = {'infos': {}, 'disco': {}, 'gc_config': {}, - 'search': {}} + 'search': {}, 'online_dialog': {}} + # online_dialog contains all dialogs that have a meaning only when we + # are not disconnected self.minimized_controls[a] = {} gajim.contacts.add_account(a) gajim.groups[a] = {}

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2009