Commits January 2010

commits@gajim.org

7 participants
107 discussions

gajim: Removed a change from the previous commit because I would...
by Anaël Verrier 03 Jan '10

03 Jan '10

changeset 0570ebb4efe5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0570ebb4efe5 description: Removed a change from the previous commit because I would not have done it. I need sleep. diffstat: src/common/logger.py | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diffs (19 lines): diff -r 73b5688fb47f -r 0570ebb4efe5 src/common/logger.py --- a/src/common/logger.py Sun Jan 03 01:52:40 2010 +0100 +++ b/src/common/logger.py Sun Jan 03 01:57:44 2010 +0100 @@ -974,13 +974,8 @@ (account_jid_id, jid_id)) # Then we add all new groups information for group in groups: - try: - self.cur.execute('INSERT INTO roster_group VALUES(?, ?, ?)', - (account_jid_id, jid_id, group)) - except IntegrityError: - # Some servers (like jabberd) seems to put contact twice in the - # roster. So we do nothing if it appears. (see #5206) - pass + self.cur.execute('INSERT INTO roster_group VALUES(?, ?, ?)', + (account_jid_id, jid_id, group)) if name is None: name = ''

1 0

gajim: forgot to remove an useless line in the previous commit...
by Anaël Verrier 03 Jan '10

03 Jan '10

changeset 73b5688fb47f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73b5688fb47f description: forgot to remove an useless line in the previous commit... diffstat: src/common/connection.py | 1 - src/common/logger.py | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diffs (30 lines): diff -r bbcdf53a324c -r 73b5688fb47f src/common/connection.py --- a/src/common/connection.py Sun Jan 03 01:49:49 2010 +0100 +++ b/src/common/connection.py Sun Jan 03 01:52:40 2010 +0100 @@ -2016,7 +2016,6 @@ self.add_lang(p) if not change_nick: t = p.setTag(common.xmpp.NS_MUC + ' x') - last_date = self.last_history_time[room_jid] last_date = max(self.last_history_time[room_jid], time.time() - gajim.config.get('muc_restore_timeout') * 60) last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date)) diff -r bbcdf53a324c -r 73b5688fb47f src/common/logger.py --- a/src/common/logger.py Sun Jan 03 01:49:49 2010 +0100 +++ b/src/common/logger.py Sun Jan 03 01:52:40 2010 +0100 @@ -974,8 +974,13 @@ (account_jid_id, jid_id)) # Then we add all new groups information for group in groups: - self.cur.execute('INSERT INTO roster_group VALUES(?, ?, ?)', - (account_jid_id, jid_id, group)) + try: + self.cur.execute('INSERT INTO roster_group VALUES(?, ?, ?)', + (account_jid_id, jid_id, group)) + except IntegrityError: + # Some servers (like jabberd) seems to put contact twice in the + # roster. So we do nothing if it appears. (see #5206) + pass if name is None: name = ''

1 0

gajim: Fixed a minor bug in the calculation of the date for room...
by Anaël Verrier 03 Jan '10

03 Jan '10

changeset bbcdf53a324c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bbcdf53a324c description: Fixed a minor bug in the calculation of the date for room history request. Thanks Zash for the report. diffstat: src/common/connection.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diffs (18 lines): diff -r 0e2c345029a5 -r bbcdf53a324c src/common/connection.py --- a/src/common/connection.py Sat Jan 02 22:47:36 2010 +0100 +++ b/src/common/connection.py Sun Jan 03 01:49:49 2010 +0100 @@ -2017,12 +2017,8 @@ if not change_nick: t = p.setTag(common.xmpp.NS_MUC + ' x') last_date = self.last_history_time[room_jid] - if last_date == 0: - last_date = time.time() - gajim.config.get( - 'muc_restore_timeout') * 60 - else: - last_date = min(last_date, time.time() - gajim.config.get( - 'muc_restore_timeout') * 60) + last_date = max(self.last_history_time[room_jid], + time.time() - gajim.config.get('muc_restore_timeout') * 60) last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date)) t.setTag('history', {'maxstanzas': gajim.config.get( 'muc_restore_lines'), 'since': last_date})

1 0

gajim: catch "address family not supported" errors when sending ...
by avm＠lagaule.org 02 Jan '10

02 Jan '10

changeset 0e2c345029a5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0e2c345029a5 description: catch "address family not supported" errors when sending files. Fixes #5327 diffstat: src/common/socks5.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (20 lines): diff -r ae0009ef4d3e -r 0e2c345029a5 src/common/socks5.py --- a/src/common/socks5.py Sat Jan 02 22:45:02 2010 +0100 +++ b/src/common/socks5.py Sat Jan 02 22:47:36 2010 +0100 @@ -860,8 +860,14 @@ def bind(self): for ai in self.ais: - #try the different possibilities (ipv6, ipv4, etc.) - self._serv = socket.socket(*ai[:3]) + # try the different possibilities (ipv6, ipv4, etc.) + try: + self._serv = socket.socket(*ai[:3]) + except socket.error, e: + if e.errno == EAFNOSUPPORT: + self.ai = None + continue + raise self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)

1 0

gajim: Really ignore messages from invalid jids. Fixes #5539
by Yann Leboulanger 02 Jan '10

02 Jan '10

changeset ae0009ef4d3e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ae0009ef4d3e description: Really ignore messages from invalid jids. Fixes #5539 diffstat: src/common/connection_handlers.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r c615442d792f -r ae0009ef4d3e src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Jan 02 22:33:25 2010 +0100 +++ b/src/common/connection_handlers.py Sat Jan 02 22:45:02 2010 +0100 @@ -1370,6 +1370,7 @@ except helpers.InvalidFormat: self.dispatch('ERROR', (_('Invalid Jabber ID'), _('A message from a non-valid JID arrived, it has been ignored.'))) + return addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS)

1 0

gajim: make zeroconf connections is_zeroconf attribute True. Fix...
by Yann Leboulanger 02 Jan '10

02 Jan '10

changeset c615442d792f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c615442d792f description: make zeroconf connections is_zeroconf attribute True. Fixes #5538 diffstat: src/common/zeroconf/connection_zeroconf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (18 lines): diff -r e0dc940c463a -r c615442d792f src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Sat Jan 02 22:22:25 2010 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Sat Jan 02 22:33:25 2010 +0100 @@ -56,13 +56,13 @@ # system username self.username = None self.server_resource = '' # zeroconf has no resource, fake an empty one - self.is_zeroconf = True self.call_resolve_timeout = False # we don't need a password, but must be non-empty self.password = 'zeroconf' self.autoconnect = False CommonConnection.__init__(self, name) + self.is_zeroconf = True def get_config_values_or_default(self): """

1 0

gajim: fix traceback when enabling an account. Fixes #5537
by Yann Leboulanger 02 Jan '10

02 Jan '10

changeset e0dc940c463a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0dc940c463a description: fix traceback when enabling an account. Fixes #5537 diffstat: src/config.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r d8f7cd1a1cbb -r e0dc940c463a src/config.py --- a/src/config.py Wed Dec 30 13:09:55 2009 +0100 +++ b/src/config.py Sat Jan 02 22:22:25 2010 +0100 @@ -2446,7 +2446,8 @@ def on_enable_checkbutton1_toggled(self, widget): if self.ignore_events: return - if gajim.connections[self.current_account].connected > 0: + if self.current_account in gajim.connections and \ + gajim.connections[self.current_account].connected > 0: # connecting or connected self.ignore_events = True self.xml.get_widget('enable_checkbutton1').set_active(True)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2010