Commits November 2014

commits@gajim.org

1 participants
63 discussions

gajim: [fschmaus] Improve XEP-0082 support. Fixes #7814
by Gajim 14 Nov '14

14 Nov '14

changeset 2a25e5d9d68a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2a25e5d9d68a description: [fschmaus] Improve XEP-0082 support. Fixes #7814 diffstat: src/common/connection_handlers_events.py | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 0446dbae707d -r 2a25e5d9d68a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Aug 22 15:44:07 2014 +0200 +++ b/src/common/connection_handlers_events.py Sun Sep 07 21:51:06 2014 +0200 @@ -220,12 +220,21 @@ def dst(self, dt): return ZERO + if utc_time[-1:] == 'Z': + # Remove the trailing 'Z' + utc_time = utc_time[:-1] + elif utc_time[-6:] == "+00:00": + # Remove the trailing "+00:00" + utc_time = utc_time[:-6] + else: + log.info("Wrong timezone defintion: %s" % str(e)) + return try: - t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') + t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') except ValueError: try: t = datetime.datetime.strptime(utc_time, - '%Y-%m-%dT%H:%M:%S.%fZ') + '%Y-%m-%dT%H:%M:%S.%f') except ValueError as e: log.info('Wrong time format: %s' % str(e)) return

1 0

gajim: display error messages even if they don't have a <body>. ...
by Gajim 14 Nov '14

14 Nov '14

changeset 8cf84966ffe9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8cf84966ffe9 description: display error messages even if they don't have a <body>. Fixes #7798, see #6756 diffstat: src/common/connection_handlers.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 2a25e5d9d68a -r 8cf84966ffe9 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Sep 07 21:51:06 2014 +0200 +++ b/src/common/connection_handlers.py Sun Sep 14 14:23:31 2014 +0200 @@ -1231,6 +1231,8 @@ if obj.mtype == 'error': if not obj.msgtxt: + obj.msgtxt = _('message') + if not obj.msgtxt: return True self.dispatch_error_message(obj.stanza, obj.msgtxt, obj.session, obj.fjid, obj.timestamp)

1 0

gajim: allow = char in option values. Fixes #7804
by Gajim 14 Nov '14

14 Nov '14

changeset a19603a11f64 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a19603a11f64 description: allow = char in option values. Fixes #7804 diffstat: src/common/optparser.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8cf84966ffe9 -r a19603a11f64 src/common/optparser.py --- a/src/common/optparser.py Sun Sep 14 14:23:31 2014 +0200 +++ b/src/common/optparser.py Sun Sep 14 14:47:03 2014 +0200 @@ -57,7 +57,7 @@ new_version = gajim.config.get('version') new_version = new_version.split('-', 1)[0] seen = set() - regex = re.compile(r"(?P<optname>[^.]+)(?:(?:\.(?P<key>.+))?\.(?P<subname>[^.]+))?\s=\s(?P<value>.*)") + regex = re.compile(r"(?P<optname>[^.=]+)(?:(?:\.(?P<key>.+))?\.(?P<subname>[^.=]+))?\s=\s(?P<value>.*)") for line in fd: optname, key, subname, value = regex.match(line).groups()

1 0

gajim: remove useless test
by Gajim 14 Nov '14

14 Nov '14

changeset 1e98e2bfd3b2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1e98e2bfd3b2 description: remove useless test diffstat: src/common/connection_handlers.py | 2 -- src/common/protocol/bytestream.py | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diffs (24 lines): diff -r a19603a11f64 -r 1e98e2bfd3b2 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Sep 14 14:47:03 2014 +0200 +++ b/src/common/connection_handlers.py Mon Sep 15 14:03:52 2014 +0200 @@ -1232,8 +1232,6 @@ if obj.mtype == 'error': if not obj.msgtxt: obj.msgtxt = _('message') - if not obj.msgtxt: - return True self.dispatch_error_message(obj.stanza, obj.msgtxt, obj.session, obj.fjid, obj.timestamp) return True diff -r a19603a11f64 -r 1e98e2bfd3b2 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Sep 14 14:47:03 2014 +0200 +++ b/src/common/protocol/bytestream.py Mon Sep 15 14:03:52 2014 +0200 @@ -393,7 +393,7 @@ my_ips = [self.peerhost[0]] # The ip we're connected to server with # all IPs from local DNS for addr in socket.getaddrinfo(socket.gethostname(), None): - if not addr[4][0] in my_ips and not addr[4][0].startswith('127'): + if not addr[4][0] in my_ips and not addr[4][0].startswith('127') and not addr[4][0] == '::1': my_ips.append(addr[4][0]) sender = file_props.sender

1 0

gajim: don't allow to delete contacts from an offline account. F...
by Gajim 14 Nov '14

14 Nov '14

changeset 8a6efa324723 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8a6efa324723 description: don't allow to delete contacts from an offline account. Fixes #7822 diffstat: src/roster_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (17 lines): diff -r 1e98e2bfd3b2 -r 8a6efa324723 src/roster_window.py --- a/src/roster_window.py Mon Sep 15 14:03:52 2014 +0200 +++ b/src/roster_window.py Fri Oct 03 22:48:14 2014 +0200 @@ -3459,9 +3459,13 @@ return jid = model[path][C_JID] account = model[path][C_ACCOUNT] + if not gajim.account_is_connected(account): + continue contact = gajim.contacts.get_contact_with_highest_priority( account, jid) list_.append((contact, account)) + if not list_: + return if type_ == 'contact': self.on_req_usub(widget, list_) elif type_ == 'agent':

1 0

gajim: Gajim requires python-nbxmpp-0.5.1
by Gajim 14 Nov '14

14 Nov '14

changeset c00e9337228c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c00e9337228c description: Gajim requires python-nbxmpp-0.5.1 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8a6efa324723 -r c00e9337228c src/gajim.py --- a/src/gajim.py Fri Oct 03 22:48:14 2014 +0200 +++ b/src/gajim.py Sat Oct 04 22:27:55 2014 +0200 @@ -69,7 +69,7 @@ pass HAS_NBXMPP=True -MIN_NBXMPP_VER = "0.5" +MIN_NBXMPP_VER = "0.5.1" try: import nbxmpp except ImportError:

1 0

gajim: prepare 0.16-rc2
by Gajim 14 Nov '14

14 Nov '14

changeset 94c925d854e5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=94c925d854e5 description: prepare 0.16-rc2 diffstat: ChangeLog | 1 + autogen.sh | 2 +- src/common/defs.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diffs (33 lines): diff -r 0190104f1259 -r 94c925d854e5 ChangeLog --- a/ChangeLog Wed Jul 02 18:03:40 2014 +0200 +++ b/ChangeLog Wed Jul 02 18:13:01 2014 +0200 @@ -9,6 +9,7 @@ * Support XEP-0224 Attention * Support XEP-0191 Blocking command * Better RTL languages support + * use host command to resolve SRV records if it is available Gajim 0.15.4 (25 May 2013) diff -r 0190104f1259 -r 94c925d854e5 autogen.sh --- a/autogen.sh Wed Jul 02 18:03:40 2014 +0200 +++ b/autogen.sh Wed Jul 02 18:13:01 2014 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16-alpha2" + gajimversion="0.16-rc2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 0190104f1259 -r 94c925d854e5 src/common/defs.py --- a/src/common/defs.py Wed Jul 02 18:03:40 2014 +0200 +++ b/src/common/defs.py Wed Jul 02 18:13:01 2014 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.10.0' +version = '0.16-rc2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: prevent some tracebacks
by Gajim 14 Nov '14

14 Nov '14

changeset e35390f7ae37 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e35390f7ae37 description: prevent some tracebacks diffstat: src/common/connection.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (30 lines): diff -r 94c925d854e5 -r e35390f7ae37 src/common/connection.py --- a/src/common/connection.py Wed Jul 02 18:13:01 2014 +0200 +++ b/src/common/connection.py Thu Jul 10 20:30:20 2014 +0200 @@ -2892,6 +2892,8 @@ """ Send invitation """ + if not gajim.account_is_connected(self.name): + return contact = gajim.contacts.get_contact_from_full_jid(self.name, to) if contact and contact.supports(nbxmpp.NS_CONFERENCE): # send direct invite @@ -2918,6 +2920,8 @@ """ decline a groupchat invitation """ + if not gajim.account_is_connected(self.name): + return message=nbxmpp.Message(to=room) c = message.addChild(name='x', namespace=nbxmpp.NS_MUC_USER) c = c.addChild(name='decline', attrs={'to': to}) @@ -2929,6 +2933,8 @@ """ Request voice in a moderated room """ + if not gajim.account_is_connected(self.name): + return message = nbxmpp.Message(to=room) x = nbxmpp.DataForm(typ='submit')

1 0

gajim: show first part of the JID in actions -> join group chat ...
by Gajim 14 Nov '14

14 Nov '14

changeset 79e2b01a9cab in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=79e2b01a9cab description: show first part of the JID in actions -> join group chat menu when there is no name. diffstat: src/roster_window.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (18 lines): diff -r e35390f7ae37 -r 79e2b01a9cab src/roster_window.py --- a/src/roster_window.py Thu Jul 10 20:30:20 2014 +0200 +++ b/src/roster_window.py Mon Aug 11 22:10:23 2014 +0200 @@ -6108,8 +6108,13 @@ gc_sub_menu.append(item) for bookmark in gajim.connections[account].bookmarks: + name = bookmark['name'] + if bookmark['name'] == '': + # No name was given for this bookmark. + # Use the first part of JID instead... + name = bookmark['jid'].split("@")[0] # Do not use underline. - item = Gtk.MenuItem.new_with_label(bookmark['name']) + item = Gtk.MenuItem.new_with_label(name) item.set_use_underline(False) item.connect('activate', self.on_bookmark_menuitem_activate, account, bookmark)

1 0

gajim: correctly detect when no name is provided for bookmarks
by Gajim 14 Nov '14

14 Nov '14

changeset 4754b56ec030 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4754b56ec030 description: correctly detect when no name is provided for bookmarks diffstat: src/config.py | 2 +- src/roster_window.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 79e2b01a9cab -r 4754b56ec030 src/config.py --- a/src/config.py Mon Aug 11 22:10:23 2014 +0200 +++ b/src/config.py Mon Aug 11 22:16:11 2014 +0200 @@ -3185,7 +3185,7 @@ None, None, None, None]) for bookmark in gajim.connections[account].bookmarks: - if bookmark['name'] == '': + if not bookmark['name']: # No name was given for this bookmark. # Use the first part of JID instead... name = bookmark['jid'].split("@")[0] diff -r 79e2b01a9cab -r 4754b56ec030 src/roster_window.py --- a/src/roster_window.py Mon Aug 11 22:10:23 2014 +0200 +++ b/src/roster_window.py Mon Aug 11 22:16:11 2014 +0200 @@ -6109,7 +6109,7 @@ for bookmark in gajim.connections[account].bookmarks: name = bookmark['name'] - if bookmark['name'] == '': + if not name: # No name was given for this bookmark. # Use the first part of JID instead... name = bookmark['jid'].split("@")[0]

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