Commits November 2016

commits@gajim.org

2 participants
61 discussions

gajim-plugins: Update manifest.ini and CHANGELOG
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset e5e7ac96b279 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=e5e7ac96b279 description: Update manifest.ini and CHANGELOG diffstat: omemo/CHANGELOG | 3 +++ omemo/manifest.ini | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 8e5145451caa -r e5e7ac96b279 omemo/CHANGELOG --- a/omemo/CHANGELOG Wed Nov 09 11:52:40 2016 +0100 +++ b/omemo/CHANGELOG Sat Nov 12 11:48:26 2016 +0100 @@ -1,3 +1,6 @@ +0.9.7 / 2016-11-12 +- Bugfixes + 0.9.6 / 2016-11-01 - Bugfixes diff -r 8e5145451caa -r e5e7ac96b279 omemo/manifest.ini --- a/omemo/manifest.ini Wed Nov 09 11:52:40 2016 +0100 +++ b/omemo/manifest.ini Sat Nov 12 11:48:26 2016 +0100 @@ -1,7 +1,7 @@ [info] name: OMEMO short_name: omemo -version: 0.9.6 +version: 0.9.7 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencys, you can find install instructions for your system in the Github Wiki. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> Daniel Gultsch <daniel(a)gultsch.de>

1 0

gajim-plugins: Update PKGBUILD to 0.9.5
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset 2a857b271972 in /home/hg/repos/gajim-plugins author: Tommaso Sardelli <lacapannadelloziotom(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=2a857b271972 description: Update PKGBUILD to 0.9.5 diffstat: omemo/pkgs/PKGBUILD | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r f8ccc46520e6 -r 2a857b271972 omemo/pkgs/PKGBUILD --- a/omemo/pkgs/PKGBUILD Tue Nov 01 17:47:23 2016 +0100 +++ b/omemo/pkgs/PKGBUILD Fri Oct 21 19:07:39 2016 +0200 @@ -2,7 +2,7 @@ pkgname=gajim-plugin-omemo _pkgname=gajim-omemo -pkgver=0.9 +pkgver=0.9.5 pkgrel=1 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." arch=(any) @@ -12,7 +12,7 @@ provides=('gajim-plugin-omemo') conflicts=('gajim-plugin-omemo-git') source=("https://github.com/omemo/${_pkgname}/archive/${pkgver}.tar.gz") -sha512sums=('536d0a9e368dadefefba34b02e74194c314eb0fc6343fcbb64390b7e447fb8be0214e921359959f831d0bcfaef09ae6825110ebeea947ac5a5ef3bc73da72541') +sha512sums=('5941d2e201bbed477a51994a0413a330c141d0a10696968583f68255f4d2a1a22b507d8cae57328cbbe72511918e42a54e17e7f6acbef0a064aedb0371b09b76') package() { cd $srcdir/gajim-omemo-${pkgver}

1 0

gajim: Remove unused xdg code and make it check for absolute paths
by Gajim 05 Nov '16

05 Nov '16

changeset 6068cd819e0b in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6068cd819e0b description: Remove unused xdg code and make it check for absolute paths The xdg module has never been imported due to a catchall except clause, so we can safely assume it was unused and untested. diffstat: src/common/configpaths.py | 40 +++++++++++++--------------------------- 1 files changed, 13 insertions(+), 27 deletions(-) diffs (57 lines): diff -r 4b2e515d270c -r 6068cd819e0b src/common/configpaths.py --- a/src/common/configpaths.py Sat Nov 05 15:37:30 2016 +0000 +++ b/src/common/configpaths.py Sat Nov 05 14:49:38 2016 +0000 @@ -26,11 +26,6 @@ import sys import tempfile from common import defs -HAVE_XDG = True -try: - __import__(xdg) -except: - HAVE_XDG = False ( TYPE_CONFIG, @@ -88,28 +83,19 @@ self.config_root = self.cache_root = self.data_root = '.' else: # Unices # Pass in an Unicode string, and hopefully get one back. - if HAVE_XDG: - self.config_root = xdg.BaseDirectory.load_first_config('gajim') - if not self.config_root: - # Folder doesn't exist yet. - self.config_root = os.path.join(xdg.BaseDirectory.\ - xdg_config_dirs[0], 'gajim') - - self.cache_root = os.path.join(xdg.BaseDirectory.xdg_cache_home, - 'gajim') - - self.data_root = xdg.BaseDirectory.save_data_path('gajim') - if not self.data_root: - self.data_root = os.path.join(xdg.BaseDirectory.\ - xdg_data_dirs[0], 'gajim') - else: - expand = os.path.expanduser - base = os.getenv('XDG_CONFIG_HOME') or expand('~/.config') - self.config_root = os.path.join(base, 'gajim') - base = os.getenv('XDG_CACHE_HOME') or expand('~/.cache') - self.cache_root = os.path.join(base, 'gajim') - base = os.getenv('XDG_DATA_HOME') or expand('~/.local/share') - self.data_root = os.path.join(base, 'gajim') + expand = os.path.expanduser + base = os.getenv('XDG_CONFIG_HOME') + if base is None or base[0] != '/': + base = expand('~/.config') + self.config_root = os.path.join(base, 'gajim') + base = os.getenv('XDG_CACHE_HOME') + if base is None or base[0] != '/': + base = expand('~/.cache') + self.cache_root = os.path.join(base, 'gajim') + base = os.getenv('XDG_DATA_HOME') + if base is None or base[0] != '/': + base = expand('~/.local/share') + self.data_root = os.path.join(base, 'gajim') def add(self, name, type_, path): self.paths[name] = (type_, path)

1 0

gajim: Remove unused xdg code and make it check for absolute paths
by Gajim 05 Nov '16

05 Nov '16

changeset f1752fd85edf in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f1752fd85edf description: Remove unused xdg code and make it check for absolute paths diffstat: src/common/configpaths.py | 40 +++++++++++++--------------------------- 1 files changed, 13 insertions(+), 27 deletions(-) diffs (57 lines): diff -r 520a0a46bcf1 -r f1752fd85edf src/common/configpaths.py --- a/src/common/configpaths.py Sat Nov 05 18:23:03 2016 +0100 +++ b/src/common/configpaths.py Sat Nov 05 23:51:31 2016 +0100 @@ -26,11 +26,6 @@ import sys import tempfile import defs -HAVE_XDG = True -try: - __import__(xdg) -except: - HAVE_XDG = False ( TYPE_CONFIG, @@ -88,28 +83,19 @@ self.config_root = self.cache_root = self.data_root = u'.' else: # Unices # Pass in an Unicode string, and hopefully get one back. - if HAVE_XDG: - self.config_root = xdg.BaseDirectory.load_first_config('gajim') - if not self.config_root: - # Folder doesn't exist yet. - self.config_root = os.path.join(xdg.BaseDirectory.\ - xdg_config_dirs[0], u'gajim') - - self.cache_root = os.path.join(xdg.BaseDirectory.xdg_cache_home, - u'gajim') - - self.data_root = xdg.BaseDirectory.save_data_path('gajim') - if not self.data_root: - self.data_root = os.path.join(xdg.BaseDirectory.\ - xdg_data_dirs[0], u'gajim') - else: - expand = os.path.expanduser - base = os.getenv('XDG_CONFIG_HOME') or expand(u'~/.config') - self.config_root = os.path.join(base, u'gajim') - base = os.getenv('XDG_CACHE_HOME') or expand(u'~/.cache') - self.cache_root = os.path.join(base, u'gajim') - base = os.getenv('XDG_DATA_HOME') or expand(u'~/.local/share') - self.data_root = os.path.join(base, u'gajim') + expand = os.path.expanduser + base = os.getenv('XDG_CONFIG_HOME') + if base is None or base[0] != '/': + base = expand(u'~/.config') + self.config_root = os.path.join(base, u'gajim') + base = os.getenv('XDG_CACHE_HOME') + if base is None or base[0] != '/': + base = expand(u'~/.cache') + self.cache_root = os.path.join(base, u'gajim') + base = os.getenv('XDG_DATA_HOME') + if base is None or base[0] != '/': + base = expand(u'~/.local/share') + self.data_root = os.path.join(base, u'gajim') def add(self, name, type_, path): self.paths[name] = (type_, path)

1 0

gajim: Remove NameError in Avahi code.
by Gajim 05 Nov '16

05 Nov '16

changeset d90f2bac66bd in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d90f2bac66bd description: Remove NameError in Avahi code. diffstat: src/common/zeroconf/zeroconf_avahi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 37d7514bc1fc -r d90f2bac66bd src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Sat Nov 05 18:13:13 2016 +0100 +++ b/src/common/zeroconf/zeroconf_avahi.py Sat Nov 05 15:06:08 2016 +0000 @@ -175,7 +175,7 @@ # so this probably needs to be revised again. if old_resolved_info[i][0:2] == (interface, protocol): log.debug('Deleting resolved info for interface %i, protocol %i, host %s, aprotocol %i, address %s, port %i' % old_resolved_info[i]) - del cur_hosts[i] + del old_resolved_info[i] break resolved_info = resolved_info + old_resolved_info log.debug('Collected resolved info is now: %s' % (resolved_info,))

1 0

gajim: Replace NameError SSL with correctly-imported OpenSSL.SSL.
by Gajim 05 Nov '16

05 Nov '16

changeset dbd986b92c02 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=dbd986b92c02 description: Replace NameError SSL with correctly-imported OpenSSL.SSL. diffstat: src/common/socks5.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r d90f2bac66bd -r dbd986b92c02 src/common/socks5.py --- a/src/common/socks5.py Sat Nov 05 15:06:08 2016 +0000 +++ b/src/common/socks5.py Sat Nov 05 18:17:55 2016 +0100 @@ -897,8 +897,8 @@ """ try: buff = self._recv() - except (SSL.WantReadError, SSL.WantWriteError, - SSL.WantX509LookupError), e: + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError) as e: log.info("SSL rehandshake request : " + repr(e)) raise e try:

1 0

gajim: Fix Bonjour code to not rely on undeclared variables
by Gajim 05 Nov '16

05 Nov '16

changeset ddac4eb72c2a in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ddac4eb72c2a description: Fix Bonjour code to not rely on undeclared variables diffstat: src/common/zeroconf/zeroconf_bonjour.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dbd986b92c02 -r ddac4eb72c2a src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Sat Nov 05 18:17:55 2016 +0100 +++ b/src/common/zeroconf/zeroconf_bonjour.py Sat Nov 05 18:19:44 2016 +0100 @@ -171,7 +171,7 @@ if name != self.name: # update TXT data only, as intended according to resolve_all comment old_contact = self.contacts[name] - self.contacts[name] = old_contact[0:C_TXT] + (txt,) + old_contact[C_TXT+1:] + self.contacts[name] = old_contact[0:C_TXT] + (self.txt,) + old_contact[C_TXT+1:] def service_added_callback(self, sdRef, flags, errorCode, name, regtype, domain):

1 0

gajim: Fix unknown variables in htmltextview
by Gajim 05 Nov '16

05 Nov '16

changeset 520a0a46bcf1 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=520a0a46bcf1 description: Fix unknown variables in htmltextview diffstat: src/htmltextview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ddac4eb72c2a -r 520a0a46bcf1 src/htmltextview.py --- a/src/htmltextview.py Sat Nov 05 18:19:44 2016 +0100 +++ b/src/htmltextview.py Sat Nov 05 18:23:03 2016 +0100 @@ -704,7 +704,7 @@ cite = attrs.get('cite', None) if cite: tag = self.textbuf.create_tag(id_) - tag.title = title + tag.title = attrs.get('title', None) tag.is_anchor = True elif name in LIST_ELEMS: style += ';margin-left: 2em'

1 0

gajim: Remove unreachable code, and simplify is_valid_bool.
by Gajim 05 Nov '16

05 Nov '16

changeset cf1d4f36eae9 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=cf1d4f36eae9 description: Remove unreachable code, and simplify is_valid_bool. diffstat: src/common/config.py | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diffs (27 lines): diff -r e34411e66704 -r cf1d4f36eae9 src/common/config.py --- a/src/common/config.py Fri Oct 21 22:40:50 2016 +0200 +++ b/src/common/config.py Sat Nov 05 14:53:48 2016 +0000 @@ -599,16 +599,14 @@ def is_valid_bool(self, val): if val == 'True': return True - elif val == 'False': + if val == 'False': return False - else: - ival = self.is_valid_int(val) - if ival: - return True - elif ival is None: - return None - return False - return None + ival = self.is_valid_int(val) + if ival: + return True + if ival is None: + return None + return False def is_valid_string(self, val): return val

1 0

gajim: Fix wrong variable names and forgotten imports in message...
by Gajim 05 Nov '16

05 Nov '16

changeset 37d7514bc1fc in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=37d7514bc1fc description: Fix wrong variable names and forgotten imports in message_archiving. diffstat: src/common/message_archiving.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (34 lines): diff -r cf1d4f36eae9 -r 37d7514bc1fc src/common/message_archiving.py --- a/src/common/message_archiving.py Sat Nov 05 14:53:48 2016 +0000 +++ b/src/common/message_archiving.py Sat Nov 05 18:13:13 2016 +0100 @@ -21,8 +21,12 @@ import nbxmpp from common import gajim from common import ged +from common import helpers from common.connection_handlers_events import ArchivingReceivedEvent +from calendar import timegm +from time import localtime + import logging log = logging.getLogger('gajim.c.message_archiving') @@ -188,7 +192,7 @@ msg=payload[0].getData(), nick=nick) elif payload[0].getName() == 'message': print 'Not implemented' - chat = iq_obj.getTag('chat') + chat = obj.stanza.getTag('chat') if chat: with_ = chat.getAttr('with') start_ = chat.getAttr('start') @@ -229,7 +233,7 @@ del self.awaiting_answers[id_] elif self.awaiting_answers[id_][0] == ARCHIVING_MODIFICATIONS_ARRIVED: - modified = iq_obj.getTag('modified') + modified = obj.stanza.getTag('modified') if modified: for element in modified.getChildren(): if element.getName() == 'changed':

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 2016