Commits September 2016

commits@gajim.org

1 participants
78 discussions

gajim: update debian changelog file for 0.16.6
by Gajim 28 Sep '16

28 Sep '16

changeset b316fae5df77 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b316fae5df77 description: update debian changelog file for 0.16.6 diffstat: debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 6b20ee151368 -r b316fae5df77 debian/changelog --- a/debian/changelog Wed Sep 28 17:35:24 2016 +0200 +++ b/debian/changelog Wed Sep 28 17:47:22 2016 +0200 @@ -1,3 +1,9 @@ +gajim (0.16.6-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Wed, 28 Sep 2016 17:46:12 +0200 + gajim (0.16.5-1) unstable; urgency=low * New upstream release

1 0

gajim: prepare 0.16.6 release
by Gajim 28 Sep '16

28 Sep '16

changeset 6b20ee151368 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=6b20ee151368 description: prepare 0.16.6 release diffstat: ChangeLog | 7 +++++++ autogen.sh | 2 +- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diffs (60 lines): diff -r 849a745fc6c1 -r 6b20ee151368 ChangeLog --- a/ChangeLog Sun Sep 18 15:18:30 2016 +0200 +++ b/ChangeLog Wed Sep 28 17:35:24 2016 +0200 @@ -1,3 +1,10 @@ +Gajim 0.16.6 ( September 2016) + + * Fix using gpg2 + * Improve message receips usage + * Improve roster filtering + * several minor bugs + Gajim 0.16.5 (28 December 2015) * Improve MAM implementation diff -r 849a745fc6c1 -r 6b20ee151368 autogen.sh --- a/autogen.sh Sun Sep 18 15:18:30 2016 +0200 +++ b/autogen.sh Wed Sep 28 17:35:24 2016 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.5" + gajimversion="0.16.6" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 849a745fc6c1 -r 6b20ee151368 gajim.nsi --- a/gajim.nsi Sun Sep 18 15:18:30 2016 +0200 +++ b/gajim.nsi Wed Sep 28 17:35:24 2016 +0200 @@ -222,7 +222,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.5" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.6" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 849a745fc6c1 -r 6b20ee151368 setup_win32.py --- a/setup_win32.py Sun Sep 18 15:18:30 2016 +0200 +++ b/setup_win32.py Wed Sep 28 17:35:24 2016 +0200 @@ -57,7 +57,7 @@ setup( name='Gajim', - version='0.16.5', + version='0.16.6', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/', diff -r 849a745fc6c1 -r 6b20ee151368 src/common/defs.py --- a/src/common/defs.py Sun Sep 18 15:18:30 2016 +0200 +++ b/src/common/defs.py Wed Sep 28 17:35:24 2016 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.5' +version = '0.16.6' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: Limit time to reconnect to 5 minutes. Fixes #8393
by Gajim 28 Sep '16

28 Sep '16

changeset 1492d4770d36 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1492d4770d36 description: Limit time to reconnect to 5 minutes. Fixes #8393 diffstat: src/common/connection.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diffs (20 lines): diff -r d5627f99bedc -r 1492d4770d36 src/common/connection.py --- a/src/common/connection.py Wed Sep 28 01:20:17 2016 +0200 +++ b/src/common/connection.py Sun Sep 18 15:15:10 2016 +0200 @@ -932,13 +932,12 @@ gajim.status_before_autoaway[self.name] = '' self.old_show = 'online' # this check has moved from _reconnect method - # do exponential backoff until 15 minutes, - # then small linear increase + # do exponential backoff until less than 5 minutes if self.retrycount < 2 or self.last_time_to_reconnect is None: self.last_time_to_reconnect = 5 - if self.last_time_to_reconnect < 800: + self.last_time_to_reconnect += randomsource.randint(0, 5) + if self.last_time_to_reconnect < 200: self.last_time_to_reconnect *= 1.5 - self.last_time_to_reconnect += randomsource.randint(0, 5) self.time_to_reconnect = int(self.last_time_to_reconnect) log.info("Reconnect to %s in %ss", self.name, self.time_to_reconnect) gajim.idlequeue.set_alarm(self._reconnect_alarm,

1 0

gajim: default connection is now only done with TLS. No more leg...
by Gajim 28 Sep '16

28 Sep '16

changeset e84eafcc8630 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e84eafcc8630 description: default connection is now only done with TLS. No more legacy SSL or plain connection. Fixes #8390 diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1492d4770d36 -r e84eafcc8630 src/common/config.py --- a/src/common/config.py Sun Sep 18 15:15:10 2016 +0200 +++ b/src/common/config.py Sun Sep 18 15:18:30 2016 +0200 @@ -350,7 +350,7 @@ 'keyname': [ opt_str, '', '', True ], 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.'), True], 'autonegotiate_esessions': [opt_bool, False, _('Should Gajim automatically start an encrypted session when possible?')], - 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'connection_types': [ opt_str, 'tls', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'authentication_mechanisms': [ opt_str, '', _('List (space separated) of authentication mechanisms to try. Can contain ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 or XEP-0078') ],

1 0

gajim: Correctly append shown value to list
by Gajim 27 Sep '16

27 Sep '16

changeset d5627f99bedc in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d5627f99bedc description: Correctly append shown value to list diffstat: src/common/logger.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1c0b9c0998b6 -r d5627f99bedc src/common/logger.py --- a/src/common/logger.py Tue Sep 27 01:26:04 2016 +0200 +++ b/src/common/logger.py Wed Sep 28 01:20:17 2016 +0200 @@ -495,7 +495,7 @@ continue results[0] = list(results[0]) results[0][5] = json.loads(results[0][5]) - results[0][6] = shown + results[0].append(shown) all_messages.append(results[0]) return all_messages

1 0

gajim: Inconify Gajim instead of hiding the window - Fixes #8374
by Gajim 26 Sep '16

26 Sep '16

changeset 1c0b9c0998b6 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1c0b9c0998b6 description: Inconify Gajim instead of hiding the window - Fixes #8374 When hiding the Window the app is removed from the Ubuntu Launcher and it cannot be restored diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 397061a92391 -r 1c0b9c0998b6 src/roster_window.py --- a/src/roster_window.py Mon Sep 26 10:46:22 2016 +0200 +++ b/src/roster_window.py Tue Sep 27 01:26:04 2016 +0200 @@ -2448,7 +2448,7 @@ x, y = self.window.get_position() gajim.config.set('roster_x-position', x) gajim.config.set('roster_y-position', y) - self.window.hide() + self.window.iconify() elif gajim.config.get('quit_on_roster_x_button'): self.on_quit_request() else:

1 0

gajim-plugins: Use cert validation only on Windows for now
by Gajim Plugins 26 Sep '16

26 Sep '16

changeset ee428886f22c in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=ee428886f22c description: Use cert validation only on Windows for now diffstat: plugin_installer/plugin_installer.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (21 lines): diff -r 4a567e86ac4b -r ee428886f22c plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Mon Sep 26 11:36:26 2016 +0200 +++ b/plugin_installer/plugin_installer.py Tue Sep 27 00:34:03 2016 +0200 @@ -114,15 +114,14 @@ '\n%s') % plugins_str, on_response_yes=open_update) def ftp_connect(self): - if sys.version_info >= (3, 4): + if os.name == 'nt': ctx = ssl.create_default_context() con = ftplib.FTP_TLS(self.config['ftp_server'], context=ctx) - log.debug('Plugin Server Cert verified') else: con = ftplib.FTP_TLS(self.config['ftp_server']) + con.login() con.prot_p() - return con @log_calls('PluginInstallerPlugin')

1 0

gajim-plugins: plugin_installer: Fix potential crash on cert ver...
by Gajim Plugins 26 Sep '16

26 Sep '16

changeset ba239256ab1a in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=ba239256ab1a description: plugin_installer: Fix potential crash on cert verify failure diffstat: plugin_installer/plugin_installer.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r ee428886f22c -r ba239256ab1a plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Tue Sep 27 00:34:03 2016 +0200 +++ b/plugin_installer/plugin_installer.py Mon Sep 26 23:18:40 2016 +0100 @@ -317,7 +317,9 @@ for i in range(len(self.available_plugins_model)): self.available_plugins_model[i][C_UPGRADE] = False self.progressbar.hide() - WarningDialog(_('Ftp error'), error_text, self.window) + def warn(): + WarningDialog(_('Ftp error'), error_text, self.window) + GLib.idle_add(warn) def on_plugin_downloaded(self, widget, plugin_dirs): dialog = HigDialog(None, Gtk.MessageType.INFO, Gtk.ButtonsType.OK,

1 0

gajim-plugins: Update manifest.ini
by Gajim Plugins 26 Sep '16

26 Sep '16

changeset 2abf9d5ec2bb in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=2abf9d5ec2bb description: Update manifest.ini diffstat: plugin_installer/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ba239256ab1a -r 2abf9d5ec2bb plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Mon Sep 26 23:18:40 2016 +0100 +++ b/plugin_installer/manifest.ini Tue Sep 27 00:35:59 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.16 +version: 0.17 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org>

1 0

gajim-plugins: Only allow TLS connection and verify certificate ...
by Gajim Plugins 26 Sep '16

26 Sep '16

changeset 4a567e86ac4b in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=4a567e86ac4b description: Only allow TLS connection and verify certificate - Fixes #78 Certificate is only on python >= 3.4 verified diffstat: plugin_installer/config_dialog.ui | 33 +++++++-------------------------- plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 27 ++++++++++++++------------- 3 files changed, 22 insertions(+), 40 deletions(-) diffs (203 lines): diff -r 254515ca906e -r 4a567e86ac4b plugin_installer/config_dialog.ui --- a/plugin_installer/config_dialog.ui Thu Sep 22 18:57:53 2016 +0200 +++ b/plugin_installer/config_dialog.ui Mon Sep 26 11:36:26 2016 +0200 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + <interface> -  + <requires lib="gtk+" version="3.0"/> <object class="GtkWindow" id="window1"> <property name="can_focus">False</property> <child> @@ -65,10 +66,10 @@ <object class="GtkLabel" id="plugin_name_label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label"><empty></property> <property name="selectable">True</property> <property name="ellipsize">end</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -97,11 +98,11 @@ <object class="GtkLabel" id="plugin_authors_label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="xpad">6</property> <property name="label"><empty></property> <property name="selectable">True</property> <property name="ellipsize">end</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -139,7 +140,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <property name="xalign">0</property> @@ -238,7 +238,6 @@ <property name="sensitive">False</property> <property name="can_focus">False</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <signal name="clicked" handler="on_inslall_upgrade_clicked" swapped="no"/> <child> <object class="GtkHBox" id="hbox1"> @@ -260,8 +259,8 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Install/Upgrade</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Install/Upgrade</property> </object> <packing> <property name="expand">True</property> @@ -316,8 +315,8 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Ftp server:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Ftp server:</property> </object> <packing> <property name="expand">False</property> @@ -351,7 +350,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="focus_on_click">False</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> @@ -370,7 +368,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="focus_on_click">False</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> @@ -383,23 +380,7 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="TLS"> - <property name="label" translatable="yes">Use TLS transport</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="focus_on_click">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_tls_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> + <placeholder/> </child> </object> </child> diff -r 254515ca906e -r 4a567e86ac4b plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Thu Sep 22 18:57:53 2016 +0200 +++ b/plugin_installer/manifest.ini Mon Sep 26 11:36:26 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.15 +version: 0.16 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 254515ca906e -r 4a567e86ac4b plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Thu Sep 22 18:57:53 2016 +0200 +++ b/plugin_installer/plugin_installer.py Mon Sep 26 11:36:26 2016 +0200 @@ -33,6 +33,8 @@ import fnmatch import sys import zipfile +import ssl +import logging from common import gajim from plugins import GajimPlugin @@ -41,6 +43,8 @@ from dialogs import WarningDialog, HigDialog, YesNoDialog from plugins.gui import GajimPluginConfigDialog +log = logging.getLogger('gajim.plugin_system.plugin_installer') + ( C_PIXBUF, C_DIR, @@ -68,8 +72,7 @@ self.config_dialog = PluginInstallerPluginConfigDialog(self) self.config_default_values = {'ftp_server': ('ftp.gajim.org', ''), 'check_update': (True, ''), - 'check_update_periodically': (True, ''), - 'TLS': (True, ''),} + 'check_update_periodically': (True, '')} self.window = None self.progressbar = None self.available_plugins_model = None @@ -111,13 +114,15 @@ '\n%s') % plugins_str, on_response_yes=open_update) def ftp_connect(self): - if sys.version_info[:2] > (2, 6) and self.config['TLS'] : + if sys.version_info >= (3, 4): + ctx = ssl.create_default_context() + con = ftplib.FTP_TLS(self.config['ftp_server'], context=ctx) + log.debug('Plugin Server Cert verified') + else: con = ftplib.FTP_TLS(self.config['ftp_server']) - con.login() - con.prot_p() - else: - con = ftplib.FTP(self.config['ftp_server']) - con.login() + con.login() + con.prot_p() + return con @log_calls('PluginInstallerPlugin') @@ -612,7 +617,7 @@ with zipfile.ZipFile(self.buffer_) as zip_file: zip_file.extractall(os.path.join(user_dir)) - + self.ftp.quit() GLib.idle_add(self.window.emit, 'plugin_downloaded', self.remote_dirs) GLib.source_remove(self.pulse) @@ -638,7 +643,6 @@ self.plugin.config['check_update']) self.xml.get_object('check_update_periodically').set_active( self.plugin.config['check_update_periodically']) - self.xml.get_object('TLS').set_active(self.plugin.config['TLS']) def on_hide(self, widget): widget = self.xml.get_object('ftp_server') @@ -649,6 +653,3 @@ def on_check_update_periodically_toggled(self, widget): self.plugin.config['check_update_periodically'] = widget.get_active() - - def on_tls_toggled(self, widget): - self.plugin.config['TLS'] = widget.get_active()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2016