Commits

commits@gajim.org

17632 discussions

gajim: do TLS handshake without blocking. Fixes #7250
by Yann Leboulanger 28 Oct '12

28 Oct '12

changeset ceb385c74b66 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ceb385c74b66 description: do TLS handshake without blocking. Fixes #7250 diffstat: src/common/xmpp/tls_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (19 lines): diff -r de75ed7e7ed7 -r ceb385c74b66 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Thu Oct 18 16:05:31 2012 +0400 +++ b/src/common/xmpp/tls_nb.py Sun Oct 28 16:59:11 2012 +0100 @@ -418,13 +418,13 @@ tcpsock._send = wrapper.send log.debug("Initiating handshake...") - tcpsock._sslObj.setblocking(True) try: tcpsock._sslObj.do_handshake() + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError), e: + pass except: log.error('Error while TLS handshake: ', exc_info=True) return False - tcpsock._sslObj.setblocking(False) self._owner.ssl_lib = PYOPENSSL return True

1 0

gajim: Fix ugly statusicon in MATE desktop.Set statusicon_size t...
by Fomin Denis 18 Oct '12

18 Oct '12

changeset de75ed7e7ed7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=de75ed7e7ed7 description: Fix ugly statusicon in MATE desktop.Set statusicon_size to 16 if MATE session detected. diffstat: src/statusicon.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (21 lines): diff -r fd2366743516 -r de75ed7e7ed7 src/statusicon.py --- a/src/statusicon.py Thu Oct 18 00:36:57 2012 +0400 +++ b/src/statusicon.py Thu Oct 18 16:05:31 2012 +0400 @@ -118,13 +118,16 @@ def on_status_icon_size_changed(self, statusicon, size): if size > 31: self.statusicon_size = '32' - elif size > 23: + elif size > 23: self.statusicon_size = '24' else: self.statusicon_size = '16' if os.environ.get('KDE_FULL_SESSION') == 'true': # detect KDE session. see #5476 self.statusicon_size = '32' + if os.environ.get('MATE_DESKTOP_SESSION_ID'): + # detect MATE session. + self.statusicon_size = '16' self.set_img() def set_img(self):

1 0

gajim: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBA...
by Fomin Denis 17 Oct '12

17 Oct '12

changeset fd2366743516 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fd2366743516 description: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBAL = 70. A network device is connected, with global network connectivity.) diffstat: src/network_manager_listener.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff -r e5ad3e5e0d51 -r fd2366743516 src/network_manager_listener.py --- a/src/network_manager_listener.py Sun Oct 14 18:21:30 2012 +0200 +++ b/src/network_manager_listener.py Thu Oct 18 00:36:57 2012 +0400 @@ -45,9 +45,10 @@ def state_changed(state): """ - For Network Manager 0.7 + For Network Manager 0.7 - 0.9 """ - if props.Get("org.freedesktop.NetworkManager", "State") == 3: + nm_state = props.Get("org.freedesktop.NetworkManager", "State") + if nm_state == 3 or nm_state == 70: for connection in gajim.connections.itervalues(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect:

1 0

gajim: fix typo
by Yann Leboulanger 14 Oct '12

14 Oct '12

changeset e5ad3e5e0d51 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e5ad3e5e0d51 description: fix typo diffstat: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d65b5085ef14 -r e5ad3e5e0d51 ChangeLog --- a/ChangeLog Sat Oct 13 17:32:19 2012 -0400 +++ b/ChangeLog Sun Oct 14 18:21:30 2012 +0200 @@ -1,7 +1,7 @@ Gajim 0.15.1 (29 August 2012) * Switch from python-farsight to python-farstream - * improve performences + * improve performances * Fix roster filter with unicode chars * Fix connection to msn jabber server * Fix some GPG issues

1 0

gajim: initialize elapsed-time
by Jefry Lagrange 13 Oct '12

13 Oct '12

changeset d65b5085ef14 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d65b5085ef14 description: initialize elapsed-time diffstat: src/common/file_props.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 34b5c42a7656 -r d65b5085ef14 src/common/file_props.py --- a/src/common/file_props.py Sat Oct 13 14:31:16 2012 -0400 +++ b/src/common/file_props.py Sat Oct 13 17:32:19 2012 -0400 @@ -110,7 +110,8 @@ # transfer type: 's' for sending and 'r' for receiving self.type_ = None self.error = None - self.elapsed_time = None + # Elapsed time of the file transfer + self.elapsed_time = 0 self.last_time = None self.received_len = None # full file path

1 0

gajim: only compare file hashes when we actually have a hash
by Jefry Lagrange 13 Oct '12

13 Oct '12

changeset 34b5c42a7656 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=34b5c42a7656 description: only compare file hashes when we actually have a hash diffstat: src/common/jingle_ft.py | 3 ++- src/filetransfers_window.py | 2 +- src/gui_interface.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diffs (37 lines): diff -r 73ede4f2f62c -r 34b5c42a7656 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Fri Oct 12 00:05:26 2012 -0400 +++ b/src/common/jingle_ft.py Sat Oct 13 14:31:16 2012 -0400 @@ -184,7 +184,8 @@ self.file_props.streamhosts = self.transport.remote_candidates # Calculate file hash in a new thread # if we haven't sent the hash already. - if self.file_props.hash_ is None and self.file_props.algo: + if self.file_props.hash_ is None and self.file_props.algo and \ + not self.werequest: self.hashThread = threading.Thread(target=self.__send_hash) self.hashThread.start() for host in self.file_props.streamhosts: diff -r 73ede4f2f62c -r 34b5c42a7656 src/filetransfers_window.py --- a/src/filetransfers_window.py Fri Oct 12 00:05:26 2012 -0400 +++ b/src/filetransfers_window.py Sat Oct 13 14:31:16 2012 -0400 @@ -660,7 +660,7 @@ if transfered_size == full_size: # If we are receiver and this is a jingle session if file_props.type_ == 'r' and \ - file_props.session_type == 'jingle': + file_props.session_type == 'jingle' and file_props.hash_: # Show that we are computing the hash self.set_status(file_props, 'computing') else: diff -r 73ede4f2f62c -r 34b5c42a7656 src/gui_interface.py --- a/src/gui_interface.py Fri Oct 12 00:05:26 2012 -0400 +++ b/src/gui_interface.py Sat Oct 13 14:31:16 2012 -0400 @@ -985,7 +985,7 @@ if file_props.stalled or file_props.paused: return - if file_props.type_ == 'r': # we receive a file + if file_props.type_ == 'r' and file_props.hash_: # we receive a file # we compare hashes if file_props.session_type == 'jingle': # Compare hashes in a new thread

1 0

gajim: first thing to do when receiving a jingle stanza is to ac...
by Jefry Lagrange 12 Oct '12

12 Oct '12

changeset 73ede4f2f62c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73ede4f2f62c description: first thing to do when receiving a jingle stanza is to acknowledge it diffstat: src/common/jingle_session.py | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diffs (45 lines): diff -r a180b4e9890c -r 73ede4f2f62c src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Oct 09 22:48:01 2012 -0400 +++ b/src/common/jingle_session.py Fri Oct 12 00:05:26 2012 -0400 @@ -105,26 +105,27 @@ # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack self.callbacks = { - 'content-accept': [self.__on_content_accept, - self.__broadcast, self.__ack], - 'content-add': [self.__on_content_add, self.__broadcast, - self.__ack], #TODO + 'content-accept': [self.__ack, self.__on_content_accept, + self.__broadcast], + 'content-add': [self.__ack, + self.__on_content_add, self.__broadcast + ], #TODO 'content-modify': [self.__ack], #TODO 'content-reject': [self.__ack, self.__on_content_remove], 'content-remove': [self.__ack, self.__on_content_remove], - 'description-info': [self.__broadcast, self.__ack], #TODO + 'description-info': [self.__ack, self.__broadcast], #TODO 'security-info': [self.__ack], #TODO - 'session-accept': [self.__on_session_accept, + 'session-accept': [self.__ack, self.__on_session_accept, self.__on_content_accept, self.__broadcast], - 'session-info': [self.__broadcast, - self.__on_session_info, self.__ack], - 'session-initiate': [self.__on_session_initiate, - self.__broadcast, self.__ack], - 'session-terminate': [self.__on_session_terminate, - self.__broadcast_all, self.__ack], - 'transport-info': [self.__broadcast, self.__ack], - 'transport-replace': [self.__broadcast, + 'session-info': [self.__ack, self.__broadcast, + self.__on_session_info ], + 'session-initiate': [self.__ack, self.__on_session_initiate, + self.__broadcast], + 'session-terminate': [self.__ack,self.__on_session_terminate, + self.__broadcast_all], + 'transport-info': [self.__ack, self.__broadcast], + 'transport-replace': [self.__ack, self.__broadcast, self.__on_transport_replace], #TODO 'transport-accept': [self.__ack], #TODO 'transport-reject': [self.__ack], #TODO

1 0

gajim: fix getting info of file when receiving a file request
by Jefry Lagrange 10 Oct '12

10 Oct '12

changeset a180b4e9890c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a180b4e9890c description: fix getting info of file when receiving a file request diffstat: src/common/connection_handlers_events.py | 5 ++++- src/common/jingle.py | 4 +--- src/common/jingle_session.py | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diffs (62 lines): diff -r c7a32812c477 -r a180b4e9890c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/connection_handlers_events.py Tue Oct 09 22:48:01 2012 -0400 @@ -2001,9 +2001,12 @@ else: file_tag = desc.getTag('request').getTag('file') h = file_tag.getTag('hash') + h = h.getData() if h else None n = file_tag.getTag('name') + n = n.getData() if n else None pjid = gajim.get_jid_without_resource(self.fjid) - file_info = self.conn.get_file_info(pjid, hash_=h, name=n) + file_info = self.conn.get_file_info(pjid, hash_=h, + name=n,account=self.conn.name) self.file_props.file_name = file_info['file-name'] self.file_props.sender = self.conn._ft_get_our_jid() self.file_props.receiver = self.fjid diff -r c7a32812c477 -r a180b4e9890c src/common/jingle.py --- a/src/common/jingle.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/jingle.py Tue Oct 09 22:48:01 2012 -0400 @@ -161,7 +161,6 @@ return c.transport.sid def __hash_support(self, contact): - if contact.supports(xmpp.NS_HASHES): if contact.supports(xmpp.NS_HASHES_MD5): return 'md5' @@ -171,7 +170,6 @@ return 'sha-256' elif contact.supports(xmpp.NS_HASHES_SHA512): return 'sha-512' - return None def iter_jingle_sessions(self, jid, sid=None, media=None): @@ -194,7 +192,7 @@ # to be requested again. self.files.append(file_) - def get_file_info(self, peerjid, hash_=None, name=None): + def get_file_info(self, peerjid, hash_=None, name=None, account=None): if hash_: for f in self.files: # DEBUG #if f['hash'] == '1294809248109223': diff -r c7a32812c477 -r a180b4e9890c src/common/jingle_session.py --- a/src/common/jingle_session.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/jingle_session.py Tue Oct 09 22:48:01 2012 -0400 @@ -520,9 +520,12 @@ if request: self.request = True h = request.getTag('file').getTag('hash') + h = h.getData() if h else None n = request.getTag('file').getTag('name') + n = n.getData() if n else None pjid = gajim.get_jid_without_resource(self.peerjid) - file_info = self.connection.get_file_info(pjid, h, n) + file_info = self.connection.get_file_info(pjid, h, n, + self.connection.name) if not file_info: log.warning('The peer ' + pjid + \ ' is requesting a ' + \

1 0

gajim: prevent traceback when a wrong certificate is being check...
by Yann Leboulanger 08 Oct '12

08 Oct '12

changeset c7a32812c477 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c7a32812c477 description: prevent traceback when a wrong certificate is being checked. Fixes #7242 diffstat: src/common/check_X509.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r ccef4ef8fe6b -r c7a32812c477 src/common/check_X509.py --- a/src/common/check_X509.py Sat Oct 06 19:07:48 2012 +0200 +++ b/src/common/check_X509.py Mon Oct 08 11:14:47 2012 +0200 @@ -133,7 +133,12 @@ for i in range(0, cnt): ext = cert.get_extension(i) if ext.get_short_name() == 'subjectAltName': - r = _parse_asn1(ext.get_data()) + try: + r = _parse_asn1(ext.get_data()) + except: + log.error('Wrong data in certificate: subjectAltName=%s' % \ + ext.get_data()) + continue if 'otherName' in r: if oid_xmppaddr in r['otherName']: for host in r['otherName'][oid_xmppaddr]:

1 0

gajim: prevent some traceback. see #7152
by Yann Leboulanger 06 Oct '12

06 Oct '12

changeset ccef4ef8fe6b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ccef4ef8fe6b description: prevent some traceback. see #7152 diffstat: src/roster_window.py | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diffs (66 lines): diff -r 12008ffd5492 -r ccef4ef8fe6b src/roster_window.py --- a/src/roster_window.py Sat Oct 06 19:06:56 2012 +0200 +++ b/src/roster_window.py Sat Oct 06 19:07:48 2012 +0200 @@ -5059,7 +5059,10 @@ """ When a row is added, set properties for icon renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return if type_ == 'account': self._set_account_row_background_color(renderer) renderer.set_property('xalign', 0) @@ -5089,8 +5092,11 @@ """ When a row is added, set properties for name renderer """ + try: + type_ = model[titer][C_TYPE] + except TypeError: + return theme = gajim.config.get('roster_theme') - type_ = model[titer][C_TYPE] if type_ == 'account': color = gajim.config.get_per('themes', theme, 'accounttextcolor') if color: @@ -5152,7 +5158,10 @@ """ When a row is added, draw the respective pep icon """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return # allocate space for the icon only if needed if not model[titer][data]: @@ -5176,7 +5185,11 @@ """ When a row is added, set properties for avatar renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return + if type_ in ('group', 'account'): renderer.set_property('visible', False) return @@ -5208,7 +5221,11 @@ """ When a row is added, set properties for padlock renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return + # allocate space for the icon only if needed if type_ == 'account' and model[titer][C_PADLOCK_PIXBUF]: renderer.set_property('visible', True)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits