Commits November 2014

commits@gajim.org

1 participants
63 discussions

gajim: fix showing self contact when mode is always
by Gajim 09 Nov '14

09 Nov '14

changeset b5b34a9bcf6e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b5b34a9bcf6e description: fix showing self contact when mode is always diffstat: src/roster_window.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diffs (24 lines): diff -r 09cc7417185b -r b5b34a9bcf6e src/roster_window.py --- a/src/roster_window.py Sun Nov 09 14:03:01 2014 +0100 +++ b/src/roster_window.py Sun Nov 09 15:39:26 2014 +0100 @@ -2630,6 +2630,20 @@ self.add_account_contacts(obj.conn.name, improve_speed=False) self.fire_up_unread_messages_events(obj.conn.name) else: + # add self contact + if gajim.config.get('show_self_contact') == 'always': + account = obj.conn.name + self_jid = gajim.get_jid_from_account(account) + if self_jid not in gajim.contacts.get_jid_list(account): + resource = '' + if gajim.connections[account].server_resource: + resource = gajim.connections[account].server_resource + contact = gajim.contacts.create_contact(jid=self_jid, + account=account, name=gajim.nicks[account], + groups=['self_contact'], show='offline', sub='both', + ask='none', resource=resource) + gajim.contacts.add_contact(account, contact) + self.add_contact(self_jid, account) if gajim.config.get('remember_opened_chat_controls'): account = obj.conn.name controls = gajim.config.get_per('accounts', account,

1 0

gajim: warn user when custom hostname is wrong. Fixes #7489
by Gajim 09 Nov '14

09 Nov '14

changeset 09cc7417185b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=09cc7417185b description: warn user when custom hostname is wrong. Fixes #7489 diffstat: src/common/connection.py | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diffs (28 lines): diff -r 6edeba793e2c -r 09cc7417185b src/common/connection.py --- a/src/common/connection.py Sun Oct 26 16:43:44 2014 +0100 +++ b/src/common/connection.py Sun Nov 09 14:03:01 2014 +0100 @@ -1136,10 +1136,20 @@ else: use_custom = gajim.config.get_per('accounts', self.name, 'use_custom_host') - custom_h = gajim.config.get_per('accounts', self.name, - 'custom_host') - custom_p = gajim.config.get_per('accounts', self.name, - 'custom_port') + if use_custom: + custom_h = gajim.config.get_per('accounts', self.name, + 'custom_host') + custom_p = gajim.config.get_per('accounts', self.name, + 'custom_port') + try: + helpers.idn_to_ascii(custom_h) + except Exception: + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', + pri_txt=_('Wrong Custom Hostname'), + sec_txt='Wrong custom hostname "%s". Ignoring it.' \ + % custom_h)) + use_custom = False # create connection if it doesn't already exist self.connected = 1

1 0

python-nbxmpp: [bseibold] Fix BOSH HTTP requests. Fixes #29
by Python-nbxmpp 08 Nov '14

08 Nov '14

changeset 7c7c2ca7effb in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=7c7c2ca7effb description: [bseibold] Fix BOSH HTTP requests. Fixes #29 diffstat: nbxmpp/transports_nb.py | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diffs (60 lines): diff -r 0c337cf01ae4 -r 7c7c2ca7effb nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Oct 04 22:25:11 2014 +0200 +++ b/nbxmpp/transports_nb.py Sat Nov 08 22:21:36 2014 +0100 @@ -37,7 +37,6 @@ import time import traceback import base64 -import locale try: from urllib.parse import urlparse @@ -370,8 +369,7 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno,\ - exc.strerror.decode(locale.getpreferredencoding()) + errnum, errstr = exc.errno, exc.strerror if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress @@ -474,7 +472,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error as e: - errstr = e.strerror.decode(locale.getpreferredencoding()) + errstr = e.strerror log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback) @@ -558,7 +556,7 @@ return None self.sendbuff = self.sendqueue.pop(0) try: - send_count = self._send(self.sendbuff.encode("utf-8")) + send_count = self._send(self.sendbuff) if send_count: sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:] @@ -602,8 +600,7 @@ except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.errno,\ - e.strerror.decode(locale.getpreferredencoding()) + errnum, errstr = e.errno, e.strerror if received == '': errstr = 'zero bytes on recv' @@ -766,9 +763,7 @@ Builds http message with given body. Values for headers and status line fields are taken from class variables """ - absolute_uri = '%s://%s:%s%s' % (self.http_protocol, self.http_host, - self.http_port, self.http_path) - headers = ['%s %s %s' % (method, absolute_uri, self.http_version), + headers = ['%s %s %s' % (method, self.http_path, self.http_version), 'Host: %s:%s' % (self.http_host, self.http_port), 'User-Agent: Gajim', 'Content-Type: text/xml; charset=utf-8',

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2014