Commits October 2012

commits@gajim.org

3 participants
37 discussions

gajim: correctly check is zeroconf account is connected. see #7199
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset fdc219b832af in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fdc219b832af description: correctly check is zeroconf account is connected. see #7199 diffstat: src/statusicon.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 73973c51813e -r fdc219b832af src/statusicon.py --- a/src/statusicon.py Wed Sep 05 10:59:59 2012 +0400 +++ b/src/statusicon.py Mon Sep 17 11:53:47 2012 +0200 @@ -246,7 +246,7 @@ item.connect('activate', self.on_show_menuitem_activate, 'offline') iskey = connected_accounts > 0 and not (connected_accounts == 1 and - gajim.connections[gajim.connections.keys()[0]].is_zeroconf) + gajim.zeroconf_is_connected()) chat_with_menuitem.set_sensitive(iskey) single_message_menuitem.set_sensitive(iskey) join_gc_menuitem.set_sensitive(iskey)

1 0

gajim: typo
by Fomin Denis 30 Oct '12

30 Oct '12

changeset 73973c51813e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73973c51813e description: typo diffstat: src/session.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 841390d32360 -r 73973c51813e src/session.py --- a/src/session.py Wed Aug 29 12:21:53 2012 +0200 +++ b/src/session.py Wed Sep 05 10:59:59 2012 +0400 @@ -103,8 +103,8 @@ 'or remove it (all history will be lost).') % \ common.logger.LOG_DB_PATH gajim.nec.push_incoming_event(InformationEvent(None, - conn=self.conn, level='error', pri_txt=pritxt, - sec_txt=sectxt)) + conn=self.conn, level='error', pri_txt=pritext, + sec_txt=sectext)) treat_as = gajim.config.get('treat_incoming_messages') if treat_as:

1 0

gajim: update caps hash when we activate an account. Fixes #7224
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 841390d32360 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=841390d32360 description: update caps hash when we activate an account. Fixes #7224 diffstat: src/config.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r ef1bf9661bab -r 841390d32360 src/config.py --- a/src/config.py Wed Aug 29 10:17:40 2012 +0200 +++ b/src/config.py Wed Aug 29 12:21:53 2012 +0200 @@ -2547,6 +2547,7 @@ gajim.transport_avatar[account] = {} gajim.gajim_optional_features[account] = [] gajim.caps_hash[account] = '' + helpers.update_optional_features(account) # refresh roster if len(gajim.connections) >= 2: # Do not merge accounts if only one exists @@ -4010,6 +4011,7 @@ gajim.transport_avatar[self.account] = {} gajim.gajim_optional_features[self.account] = [] gajim.caps_hash[self.account] = '' + helpers.update_optional_features(self.account) # refresh accounts window if 'accounts' in gajim.interface.instances: gajim.interface.instances['accounts'].init_accounts()

1 0

gajim: change Name in gajim.desktop. Fixes #7256
by Yann Leboulanger 29 Oct '12

29 Oct '12

changeset 417b94c33649 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=417b94c33649 description: change Name in gajim.desktop. Fixes #7256 diffstat: data/gajim.desktop.in.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (11 lines): diff -r ceb385c74b66 -r 417b94c33649 data/gajim.desktop.in.in --- a/data/gajim.desktop.in.in Sun Oct 28 16:59:11 2012 +0100 +++ b/data/gajim.desktop.in.in Mon Oct 29 15:11:16 2012 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Network;InstantMessaging;GTK;GNOME; -_Name=Gajim Instant Messenger +_Name=Gajim _GenericName=Jabber IM Client _Comment=A GTK+ Jabber client Version=1.0

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2012