Commits August 2015

commits@gajim.org

1 participants
40 discussions

gajim: do not crash when authentication with server fails. Fixes...
by Gajim 04 Aug '15

04 Aug '15

changeset bf9f8103b375 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bf9f8103b375 description: do not crash when authentication with server fails. Fixes #8115 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8c5aff636fb7 -r bf9f8103b375 src/common/connection.py --- a/src/common/connection.py Sun Jul 26 14:25:21 2015 +0200 +++ b/src/common/connection.py Mon Jul 27 13:36:49 2015 +0200 @@ -1532,7 +1532,7 @@ if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None - return + return if not self.connected: # We went offline during connecting process if self.on_connect_auth: self.on_connect_auth(None)

1 0

gajim: do not try to go autoaway or come back from autoaway if w...
by Gajim 04 Aug '15

04 Aug '15

changeset fc0e20d9098f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fc0e20d9098f description: do not try to go autoaway or come back from autoaway if we are not connected. See #8062 diffstat: src/gui_interface.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r bf9f8103b375 -r fc0e20d9098f src/gui_interface.py --- a/src/gui_interface.py Mon Jul 27 13:36:49 2015 +0200 +++ b/src/gui_interface.py Mon Jul 27 22:58:47 2015 +0200 @@ -2916,7 +2916,8 @@ def gnome_screensaver_ActiveChanged_cb(active): if not active: for account in gajim.connections: - if gajim.sleeper_state[account] == 'autoaway-forced': + if gajim.account_is_connected(account) and \ + gajim.sleeper_state[account] == 'autoaway-forced': # We came back online ofter gnome-screensaver # autoaway self.roster.send_status(account, 'online', @@ -2932,6 +2933,8 @@ not gajim.sleeper_state[account]: continue if gajim.sleeper_state[account] == 'online': + if not gajim.account_is_connected(account): + continue # we save out online status gajim.status_before_autoaway[account] = \ gajim.connections[account].status

1 0

gajim: prevent traceback
by Gajim 04 Aug '15

04 Aug '15

changeset 1b7cd2956f67 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1b7cd2956f67 description: prevent traceback diffstat: src/common/connection.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r fc0e20d9098f -r 1b7cd2956f67 src/common/connection.py --- a/src/common/connection.py Mon Jul 27 22:58:47 2015 +0200 +++ b/src/common/connection.py Tue Jul 28 20:19:19 2015 +0200 @@ -914,7 +914,9 @@ self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) - self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB) + if self.connection: + self.connection.UnregisterDisconnectHandler( + self._disconnectedReconnCB) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1

1 0

gajim: correctly detect that key is not trusted before encryptin...
by Gajim 04 Aug '15

04 Aug '15

changeset 7a48158d56c3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7a48158d56c3 description: correctly detect that key is not trusted before encrypting. Doc says: "gpg just prints a message to the console, but does not provide a specific error indication that the Python wrapper can use." Fixes #8040. See #8041 diffstat: src/common/gnupg.py | 5 ++++- src/common/gpg.py | 10 +++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diffs (45 lines): diff -r 1b7cd2956f67 -r 7a48158d56c3 src/common/gnupg.py --- a/src/common/gnupg.py Tue Jul 28 20:19:19 2015 +0200 +++ b/src/common/gnupg.py Wed Jul 29 22:32:02 2015 +0200 @@ -1094,7 +1094,7 @@ getattr(result, keyword)(L) return result - def list_keys(self, secret=False): + def list_keys(self, secret=False, keys=None): """ list the keys currently in the keyring >>> import shutil @@ -1116,6 +1116,9 @@ which='secret-keys' args = ["--list-%s" % which, "--fixed-list-mode", "--fingerprint", "--with-colons"] + if keys: + for key in keys: + args.append(key) p = self._open_subprocess(args) return self._get_list_output(p, 'list') diff -r 1b7cd2956f67 -r 7a48158d56c3 src/common/gpg.py --- a/src/common/gpg.py Tue Jul 28 20:19:19 2015 +0200 +++ b/src/common/gpg.py Wed Jul 29 22:32:02 2015 +0200 @@ -54,12 +54,16 @@ for key in recipients: if key not in self.always_trust: trust = False + if not trust: + # check that we'll be able to encrypt + result = super(GnuPG, self).list_keys(recipients, + keys=recipients) + for key in result: + if key['trust'] not in ('f', 'u'): + return '', 'NOT_TRUSTED' result = super(GnuPG, self).encrypt(str_, recipients, always_trust=trust, passphrase=self.passphrase) - if result.status == 'invalid recipient': - return '', 'NOT_TRUSTED' - if result.ok: error = '' else:

1 0

gajim: Handle PINENTRY_LAUNCHED when signing. Fixes #8099
by Gajim 04 Aug '15

04 Aug '15

changeset 6d283cb66ffe in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6d283cb66ffe description: Handle PINENTRY_LAUNCHED when signing. Fixes #8099 diffstat: src/common/gnupg.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 7a48158d56c3 -r 6d283cb66ffe src/common/gnupg.py --- a/src/common/gnupg.py Wed Jul 29 22:32:02 2015 +0200 +++ b/src/common/gnupg.py Wed Jul 29 22:35:51 2015 +0200 @@ -612,7 +612,8 @@ if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR", "NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN", - "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS"): + "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS", + "PINENTRY_LAUNCHED"): pass elif key in ("KEYEXPIRED", "SIGEXPIRED"): self.status = 'key expired'

1 0

gajim: prepare 0.16.3 release
by Gajim 04 Aug '15

04 Aug '15

changeset 25e0fff8cf51 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=25e0fff8cf51 description: prepare 0.16.3 release diffstat: ChangeLog | 6 ++++++ autogen.sh | 2 +- debian/changelog | 6 ++++++ gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diffs (72 lines): diff -r 6d283cb66ffe -r 25e0fff8cf51 ChangeLog --- a/ChangeLog Wed Jul 29 22:35:51 2015 +0200 +++ b/ChangeLog Fri Jul 31 14:27:15 2015 +0200 @@ -1,3 +1,9 @@ +Gajim 0.16.3 (31 July 2015) + + * Fix reading secret file + * Fix reconnection after suspend + * Fix sending GPG-encrypted file to non-trusted key + Gajim 0.16.2 (24 July 2015) * improve Zeroconf under windows and with IPv6 diff -r 6d283cb66ffe -r 25e0fff8cf51 autogen.sh --- a/autogen.sh Wed Jul 29 22:35:51 2015 +0200 +++ b/autogen.sh Fri Jul 31 14:27:15 2015 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.2" + gajimversion="0.16.3" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 6d283cb66ffe -r 25e0fff8cf51 debian/changelog --- a/debian/changelog Wed Jul 29 22:35:51 2015 +0200 +++ b/debian/changelog Fri Jul 31 14:27:15 2015 +0200 @@ -1,3 +1,9 @@ +gajim (0.16.3-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 31 Jul 2014 23:12:04 +0200 + gajim (0.16.2-1) unstable; urgency=low * New upstream release diff -r 6d283cb66ffe -r 25e0fff8cf51 gajim.nsi --- a/gajim.nsi Wed Jul 29 22:35:51 2015 +0200 +++ b/gajim.nsi Fri Jul 31 14:27:15 2015 +0200 @@ -212,7 +212,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.2" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 6d283cb66ffe -r 25e0fff8cf51 setup_win32.py --- a/setup_win32.py Wed Jul 29 22:35:51 2015 +0200 +++ b/setup_win32.py Fri Jul 31 14:27:15 2015 +0200 @@ -56,7 +56,7 @@ setup( name='Gajim', - version='0.16.2', + version='0.16.3', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/', diff -r 6d283cb66ffe -r 25e0fff8cf51 src/common/defs.py --- a/src/common/defs.py Wed Jul 29 22:35:51 2015 +0200 +++ b/src/common/defs.py Fri Jul 31 14:27:15 2015 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.2' +version = '0.16.3' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: Added tag gajim-0.16.3 for changeset 412182ce8274
by Gajim 04 Aug '15

04 Aug '15

changeset 29d066279e93 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=29d066279e93 description: Added tag gajim-0.16.3 for changeset 412182ce8274 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 25e0fff8cf51 -r 29d066279e93 .hgtags --- a/.hgtags Fri Jul 31 14:27:15 2015 +0200 +++ b/.hgtags Fri Jul 31 14:27:30 2015 +0200 @@ -15,3 +15,4 @@ f33618265c92e3c591ebc8d4767363d5cea2cf71 gajim-0.16 33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1 9b5eaf71e26776b12eac7f2e11b7d1afd3d78fe7 gajim-0.16.2 +412182ce8274ea938638b4d5b2bd373a7fe21ce7 gajim-0.16.3

1 0

gajim: revert [0ac22476]. It prevents reconnection. see #8062
by Gajim 04 Aug '15

04 Aug '15

changeset ac0921228c80 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ac0921228c80 description: revert [0ac22476]. It prevents reconnection. see #8062 diffstat: src/network_manager_listener.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 86931b5d08f5 -r ac0921228c80 src/network_manager_listener.py --- a/src/network_manager_listener.py Fri Jul 24 20:49:14 2015 +0200 +++ b/src/network_manager_listener.py Fri Jul 24 21:14:56 2015 +0200 @@ -56,7 +56,7 @@ for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.connected > 1: - connection._on_disconnected() + connection._disconnectedReconnCB() supported = False

1 0

gajim: never duplicate gnome keyring entries
by Gajim 04 Aug '15

04 Aug '15

changeset f583d7b71314 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f583d7b71314 description: never duplicate gnome keyring entries diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ac0921228c80 -r f583d7b71314 src/common/passwords.py --- a/src/common/passwords.py Fri Jul 24 21:14:56 2015 +0200 +++ b/src/common/passwords.py Fri Jul 24 21:30:14 2015 +0200 @@ -83,7 +83,7 @@ password = conf ## migrate the password over to keyring try: - self.save_password(account_name, password, update=False) + self.save_password(account_name, password) except GnomeKeyringError as e: if e.error == GnomeKeyring.Result.NO_KEYRING_DAEMON: ## no keyring daemon: in the future, stop using it

1 0

gajim: if config file says password is saved with libsecret (wit...
by Gajim 04 Aug '15

04 Aug '15

changeset 89fb94925f32 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=89fb94925f32 description: if config file says password is saved with libsecret (with py3 branch) we can still get it with gnomekeyring diffstat: src/common/passwords.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r f583d7b71314 -r 89fb94925f32 src/common/passwords.py --- a/src/common/passwords.py Fri Jul 24 21:30:14 2015 +0200 +++ b/src/common/passwords.py Fri Jul 24 21:53:58 2015 +0200 @@ -49,8 +49,8 @@ class SimplePasswordStorage(PasswordStorage): def get_password(self, account_name): passwd = gajim.config.get_per('accounts', account_name, 'password') - if passwd and (passwd.startswith('gnomekeyring:') or \ - passwd == '<kwallet>'): + if passwd and (passwd.startswith('gnomekeyring:') or passwd.startswith('libsecret:') or \ + passwd == '<kwallet>'): # this is not a real password, it's either a gnome # keyring token or stored in the KDE wallet return None @@ -79,7 +79,7 @@ conf = gajim.config.get_per('accounts', account_name, 'password') if conf is None or conf == '<kwallet>': return None - if not conf.startswith('gnomekeyring:'): + if not (conf.startswith('gnomekeyring:') or conf.startswith('libsecret')): password = conf ## migrate the password over to keyring try:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2015