Commits

commits@gajim.org

17632 discussions

gajim: prevent traceback. Fixes #7960
by Gajim 15 Jul '15

15 Jul '15

changeset 4f2c3b099efe in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4f2c3b099efe description: prevent traceback. Fixes #7960 diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 975912558ebf -r 4f2c3b099efe src/roster_window.py --- a/src/roster_window.py Sat Mar 07 15:04:41 2015 +0100 +++ b/src/roster_window.py Sat Mar 07 21:03:25 2015 +0100 @@ -990,6 +990,9 @@ # FIXME: maybe move to gajim.py def remove_newly_added(self, jid, account): + if account not in gajim.newly_added: + # Account has been deleted during the timeout that called us + return if jid in gajim.newly_added[account]: gajim.newly_added[account].remove(jid) self.draw_contact(jid, account)

1 0

gajim: fix typo. Fixes #7965
by Gajim 15 Jul '15

15 Jul '15

changeset d1ee5aed4dda in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d1ee5aed4dda description: fix typo. Fixes #7965 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b6b81c4c1f33 -r d1ee5aed4dda src/roster_window.py --- a/src/roster_window.py Sat Jan 24 16:09:44 2015 +0100 +++ b/src/roster_window.py Sun Feb 15 21:14:42 2015 +0100 @@ -569,7 +569,7 @@ if not family_in_roster: return False - assert old_big_jid, 'No Big Brother in nearby family % (Family: %)' % \ + assert old_big_jid, 'No Big Brother in nearby family %s (Family: %s)' %\ (nearby_family, family) iters = self._get_contact_iter(old_big_jid, old_big_account, old_big_contact, self.model)

1 0

gajim: don't mix tabs and spaces. Fixes #7966
by Gajim 15 Jul '15

15 Jul '15

changeset a360d39f09c8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a360d39f09c8 description: don't mix tabs and spaces. Fixes #7966 diffstat: src/common/zeroconf/zeroconf_avahi.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r d1ee5aed4dda -r a360d39f09c8 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Sun Feb 15 21:14:42 2015 +0100 +++ b/src/common/zeroconf/zeroconf_avahi.py Sun Feb 15 21:15:50 2015 +0100 @@ -278,8 +278,8 @@ state = self.server.GetState() if state == self.avahi.SERVER_RUNNING: if self.create_service(): - self.announced = True - return True + self.announced = True + return True return False def remove_announce(self):

1 0

gajim: fixes duplicate dict keys. Fixes #7964
by Gajim 15 Jul '15

15 Jul '15

changeset 2c13e594b09a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2c13e594b09a description: fixes duplicate dict keys. Fixes #7964 diffstat: src/common/helpers.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (17 lines): diff -r a360d39f09c8 -r 2c13e594b09a src/common/helpers.py --- a/src/common/helpers.py Sun Feb 15 21:15:50 2015 +0100 +++ b/src/common/helpers.py Sun Feb 15 21:27:10 2015 +0100 @@ -890,13 +890,11 @@ 'Aurox Linux': '/etc/aurox-release', 'Conectiva Linux': '/etc/conectiva-release', 'CRUX': '/usr/bin/crux', - 'Debian GNU/Linux': '/etc/debian_release', 'Debian GNU/Linux': '/etc/debian_version', 'Fedora Linux': '/etc/fedora-release', 'Gentoo Linux': '/etc/gentoo-release', 'Linux from Scratch': '/etc/lfs-release', 'Mandrake Linux': '/etc/mandrake-release', - 'Slackware Linux': '/etc/slackware-release', 'Slackware Linux': '/etc/slackware-version', 'Solaris/Sparc': '/etc/release', 'Source Mage': '/etc/sourcemage_version',

1 0

gajim: fix indentation
by Gajim 15 Jul '15

15 Jul '15

changeset 21538fec60da in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=21538fec60da description: fix indentation diffstat: src/disco.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2c13e594b09a -r 21538fec60da src/disco.py --- a/src/disco.py Sun Feb 15 21:27:10 2015 +0100 +++ b/src/disco.py Sun Feb 15 21:28:00 2015 +0100 @@ -960,7 +960,7 @@ name = identities[0]['name'] if name: - self.window._set_window_banner_text(self._get_agent_address(), name) + self.window._set_window_banner_text(self._get_agent_address(), name) # Add an icon to the banner. pix = self.cache.get_icon(identities, addr=self._get_agent_address())

1 0

gajim: fix exception order. Fixes #7969
by Gajim 15 Jul '15

15 Jul '15

changeset 9a016cc21074 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9a016cc21074 description: fix exception order. Fixes #7969 diffstat: src/common/logger.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 21538fec60da -r 9a016cc21074 src/common/logger.py --- a/src/common/logger.py Sun Feb 15 21:28:00 2015 +0100 +++ b/src/common/logger.py Sun Feb 15 21:29:06 2015 +0100 @@ -415,10 +415,10 @@ message, subject) VALUES (?, ?, ?, ?, ?, ?, ?)''' try: self.cur.execute(sql, values) + except sqlite.OperationalError as e: + raise exceptions.PysqliteOperationalError(str(e)) except sqlite.DatabaseError: raise exceptions.DatabaseMalformed - except sqlite.OperationalError as e: - raise exceptions.PysqliteOperationalError(str(e)) message_id = None if write_unread: try:

1 0

gajim: don't use mutable arguments as default value. Fixes #7971
by Gajim 15 Jul '15

15 Jul '15

changeset 663baf3410f2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=663baf3410f2 description: don't use mutable arguments as default value. Fixes #7971 diffstat: src/common/socks5.py | 10 +++++----- src/common/zeroconf/client_zeroconf.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diffs (60 lines): diff -r 9a016cc21074 -r 663baf3410f2 src/common/socks5.py --- a/src/common/socks5.py Sun Feb 15 21:29:06 2015 +0100 +++ b/src/common/socks5.py Mon Feb 16 12:55:10 2015 +0100 @@ -919,7 +919,7 @@ Class for sending file to socket over socks5 """ def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, - port=None, fingerprint = None, connected=True, file_props={}): + port=None, fingerprint = None, connected=True, file_props=None): self.fingerprint = fingerprint self.queue_idx = sock_hash self.queue = parent @@ -1331,7 +1331,7 @@ class Socks5SenderClient(Socks5Client, Socks5Sender): def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, - port=None, fingerprint = None, connected=True, file_props={}): + port=None, fingerprint = None, connected=True, file_props=None): Socks5Client.__init__(self, idlequeue, host, port, None, None, file_props.sid) Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, @@ -1341,7 +1341,7 @@ class Socks5SenderServer(Socks5Server, Socks5Sender): def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, - port=None, fingerprint = None, connected=True, file_props={}): + port=None, fingerprint = None, connected=True, file_props=None): Socks5Server.__init__(self, idlequeue, host, port, None, None, file_props.sid) Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, @@ -1349,7 +1349,7 @@ class Socks5ReceiverClient(Socks5Client, Socks5Receiver): - def __init__(self, idlequeue, streamhost, sid, file_props = None, + def __init__(self, idlequeue, streamhost, sid, file_props=None, fingerprint=None): Socks5Client.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], @@ -1360,7 +1360,7 @@ class Socks5ReceiverServer(Socks5Server, Socks5Receiver): - def __init__(self, idlequeue, streamhost, sid, file_props = None, + def __init__(self, idlequeue, streamhost, sid, file_props=None, fingerprint=None): Socks5Server.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], diff -r 9a016cc21074 -r 663baf3410f2 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sun Feb 15 21:29:06 2015 +0100 +++ b/src/common/zeroconf/client_zeroconf.py Mon Feb 16 12:55:10 2015 +0100 @@ -128,7 +128,7 @@ return _sock class P2PClient(IdleObject): - def __init__(self, _sock, host, port, conn_holder, stanzaqueue=[], to=None, + def __init__(self, _sock, host, port, conn_holder, stanzaqueue, to=None, on_ok=None, on_not_ok=None): self._owner = self self.Namespace = 'jabber:client'

1 0

gajim: correctly use getter / setter. Fixes #7970
by Gajim 15 Jul '15

15 Jul '15

changeset fb8a1f44d9b0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fb8a1f44d9b0 description: correctly use getter / setter. Fixes #7970 diffstat: src/disco.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diffs (30 lines): diff -r 663baf3410f2 -r fb8a1f44d9b0 src/disco.py --- a/src/disco.py Mon Feb 16 12:55:10 2015 +0100 +++ b/src/disco.py Mon Feb 16 13:11:17 2015 +0100 @@ -507,7 +507,7 @@ def __init__(self, account, jid='', node='', address_entry=False, parent=None, initial_identities=None): - self.account = account + self._account = account self.parent = parent if not jid: jid = gajim.config.get_per('accounts', account, 'hostname') @@ -589,12 +589,12 @@ self.window.show_all() @property - def _get_account(self): - return self.account + def account(self): + return self._account - @property - def _set_account(self, value): - self.account = value + @account.setter + def account(self, value): + self._account = value self.cache.account = value if self.browser: self.browser.account = value

1 0

gajim: Use bare JID when checking MAM message recipient. Fixes #...
by Gajim 15 Jul '15

15 Jul '15

changeset 36bbc045577a in /home/hg/repos/gajim author: Holger Weiss <holger(a)zedat.fu-berlin.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=36bbc045577a description: Use bare JID when checking MAM message recipient. Fixes #7973 diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fb8a1f44d9b0 -r 36bbc045577a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Feb 16 13:11:17 2015 +0100 +++ b/src/common/connection_handlers_events.py Tue Feb 10 12:57:49 2015 +0100 @@ -1102,7 +1102,7 @@ msg_ = forwarded.getTag('message') to_ = msg_.getAttr('to') if to_: - gajim.get_jid_without_resource(to_) + to_ = gajim.get_jid_without_resource(to_) else: to_ = gajim.get_jid_from_account(account) frm_ = gajim.get_jid_without_resource(msg_.getAttr('from'))

1 0

gajim: correctly cleanup handlers when disabling an account. Fix...
by Gajim 15 Jul '15

15 Jul '15

changeset 458e2751848c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=458e2751848c description: correctly cleanup handlers when disabling an account. Fixes #7711 diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r be295ef9643c -r 458e2751848c src/config.py --- a/src/config.py Wed Feb 18 12:53:37 2015 -0500 +++ b/src/config.py Sat Jan 03 14:15:18 2015 +0100 @@ -2553,6 +2553,7 @@ gajim.interface.roster.close_all(account) if account == gajim.ZEROCONF_ACC_NAME: gajim.connections[account].disable_account() + gajim.connections[account].cleanup() del gajim.connections[account] del gajim.interface.instances[account] del gajim.interface.minimized_controls[account]

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