Commits

commits@gajim.org

17632 discussions

gajim: call str() instead of unicode()
by Gajim 03 Apr '16

03 Apr '16

changeset 7e2d67a37a51 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7e2d67a37a51 description: call str() instead of unicode() diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ef8964b0afc2 -r 7e2d67a37a51 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Apr 03 14:28:08 2016 +0200 +++ b/src/common/connection_handlers_events.py Sun Apr 03 14:28:27 2016 +0200 @@ -2319,7 +2319,7 @@ base_network_events = [] def generate(self): - jid = unicode(self.file_props.receiver) + jid = str(self.file_props.receiver) self.jid = gajim.get_jid_without_resource(jid) return True

1 0

python-nbxmpp: Fix deprecation warning, cipher_list must be byte...
by Python-nbxmpp 02 Apr '16

02 Apr '16

changeset 52ba62dfad93 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=52ba62dfad93 description: Fix deprecation warning, cipher_list must be bytes and not str. diffstat: nbxmpp/tls_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 06830be9dcec -r 52ba62dfad93 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Thu Dec 17 19:47:36 2015 +0100 +++ b/nbxmpp/tls_nb.py Sat Apr 02 16:48:48 2016 +0100 @@ -267,9 +267,9 @@ self.cacerts = cacerts self.mycerts = mycerts if cipher_list is None: - self.cipher_list = 'HIGH:!aNULL:RC4-SHA' + self.cipher_list = b'HIGH:!aNULL:RC4-SHA' else: - self.cipher_list = cipher_list + self.cipher_list = cipher_list.encode('ascii') if tls_version is None: self.tls_version = '1.0' else:

1 0

gajim: fix file hash error event
by Gajim 02 Apr '16

02 Apr '16

changeset d9e620e58654 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d9e620e58654 description: fix file hash error event diffstat: src/common/events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3f1e91300a4e -r d9e620e58654 src/common/events.py --- a/src/common/events.py Sat Apr 02 14:36:33 2016 +0100 +++ b/src/common/events.py Sat Apr 02 17:10:35 2016 +0200 @@ -161,7 +161,7 @@ class FileStoppedEvent(FileRequestEvent): type_ = 'file-stopped' -class FileHashErrorEvent(Event): +class FileHashErrorEvent(FileRequestEvent): type_ = 'file-hash-rror' class JingleIncomingEvent(Event):

1 0

gajim: Widget.get_iter_at_location returns a 2-tuple on GTK+ 3.2...
by Gajim 02 Apr '16

02 Apr '16

changeset 3f1e91300a4e in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3f1e91300a4e description: Widget.get_iter_at_location returns a 2-tuple on GTK+ 3.20, so get the actual iterator. Fixes #8312. diffstat: src/conversation_textview.py | 17 ++++++++++++++--- src/htmltextview.py | 10 ++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diffs (75 lines): diff -r f03f45a3c712 -r 3f1e91300a4e src/conversation_textview.py --- a/src/conversation_textview.py Sat Apr 02 14:22:02 2016 +0200 +++ b/src/conversation_textview.py Sat Apr 02 14:36:33 2016 +0100 @@ -622,7 +622,10 @@ pointer = w.get_device_position(device) x = pointer[1] y = pointer[2] - tags = self.tv.get_iter_at_location(x, y).get_tags() + iter_ = self.tv.get_iter_at_location(x, y) + if isinstance(iter_, tuple): + iter_ = iter_[1] + tags = iter_.get_tags() tag_table = self.tv.get_buffer().get_tag_table() xep0184_warning = False for tag in tags: @@ -644,7 +647,10 @@ pointer = w.get_device_position(device) x = pointer[1] y = pointer[2] - tags = self.tv.get_iter_at_location(x, y).get_tags() + iter_ = self.tv.get_iter_at_location(x, y) + if isinstance(iter_, tuple): + iter_ = iter_[1] + tags = iter_.get_tags() tag_table = self.tv.get_buffer().get_tag_table() over_line = False for tag in tags: @@ -695,7 +701,10 @@ pointer = w.get_device_position(device) x, y = self.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, pointer[1], pointer[2]) - tags = self.tv.get_iter_at_location(x, y).get_tags() + iter_ = self.tv.get_iter_at_location(x, y) + if isinstance(iter_, tuple): + iter_ = iter_[1] + tags = iter_.get_tags() if self.change_cursor: w.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) self.change_cursor = False @@ -864,6 +873,8 @@ x, y = self.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, int(event.x), int(event.y)) iter_ = self.tv.get_iter_at_location(x, y) + if isinstance(iter_, tuple): + iter_ = iter_[1] tags = iter_.get_tags() if tags: # we clicked on sth special (it can be status message too) diff -r f03f45a3c712 -r 3f1e91300a4e src/htmltextview.py --- a/src/htmltextview.py Sat Apr 02 14:22:02 2016 +0200 +++ b/src/htmltextview.py Sat Apr 02 14:36:33 2016 +0100 @@ -899,7 +899,10 @@ pointer = w.get_device_position(device) x = pointer[1] y = pointer[2] - tags = self.get_iter_at_location(x, y).get_tags() + iter_ = self.get_iter_at_location(x, y) + if isinstance(iter_, tuple): + iter_ = iter_[1] + tags = iter_.get_tags() is_over_anchor = False for tag_ in tags: if getattr(tag_, 'is_anchor', False): @@ -918,7 +921,10 @@ pointer = w.get_device_position(device) x = pointer[1] y = pointer[2] - tags = widget.get_iter_at_location(x, y).get_tags() + iter_ = widget.get_iter_at_location(x, y) + if isinstance(iter_, tuple): + iter_ = iter_[1] + tags = iter_.get_tags() anchor_tags = [tag for tag in tags if getattr(tag, 'is_anchor', False)] if self.tooltip.timeout != 0 or self.tooltip.shown: # Check if we should hide the line tooltip

1 0

gajim: Fix a few deprecation warnings.
by Gajim 02 Apr '16

02 Apr '16

changeset 583edb66638b in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=583edb66638b description: Fix a few deprecation warnings. diffstat: src/cell_renderer_image.py | 2 +- src/gtkgui_helpers.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diffs (51 lines): diff -r c6d61947feab -r 583edb66638b src/cell_renderer_image.py --- a/src/cell_renderer_image.py Thu Mar 31 22:46:44 2016 +0200 +++ b/src/cell_renderer_image.py Sat Apr 02 12:59:42 2016 +0100 @@ -30,7 +30,7 @@ __gproperties__ = { 'image': (GObject.TYPE_OBJECT, 'Image', - 'Image', GObject.PARAM_READWRITE), + 'Image', GObject.ParamFlags.READWRITE), } def __init__(self, col_index, tv_index): diff -r c6d61947feab -r 583edb66638b src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Thu Mar 31 22:46:44 2016 +0200 +++ b/src/gtkgui_helpers.py Sat Apr 02 12:59:42 2016 +0100 @@ -32,7 +32,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -from gi.repository import GObject +from gi.repository import GLib from gi.repository import Pango import os import sys @@ -51,7 +51,7 @@ def get_icon_pixmap(icon_name, size=16, quiet=False): try: return gtk_icon_theme.load_icon(icon_name, size, 0) - except GObject.GError as e: + except GLib.GError as e: if not quiet: log.error('Unable to load icon %s: %s' % (icon_name, str(e))) @@ -63,7 +63,7 @@ return "" else: return icon_info.get_filename() - except GObject.GError as e: + except GLib.GError as e: log.error("Unable to find icon %s: %s" % (icon_name, str(e))) import vcard @@ -419,7 +419,7 @@ pixbufloader.write(file_data) pixbufloader.close() pixbuf = pixbufloader.get_pixbuf() - except GObject.GError: # 'unknown image format' + except GLib.GError: # 'unknown image format' pixbufloader.close() pixbuf = None if want_type:

1 0

gajim: merge
by Gajim 02 Apr '16

02 Apr '16

changeset f03f45a3c712 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f03f45a3c712 description: merge diffstat: src/cell_renderer_image.py | 2 +- src/gtkgui_helpers.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diffs (51 lines): diff -r 939b6bc81b28 -r f03f45a3c712 src/cell_renderer_image.py --- a/src/cell_renderer_image.py Sat Apr 02 14:06:20 2016 +0200 +++ b/src/cell_renderer_image.py Sat Apr 02 14:22:02 2016 +0200 @@ -30,7 +30,7 @@ __gproperties__ = { 'image': (GObject.TYPE_OBJECT, 'Image', - 'Image', GObject.PARAM_READWRITE), + 'Image', GObject.ParamFlags.READWRITE), } def __init__(self, col_index, tv_index): diff -r 939b6bc81b28 -r f03f45a3c712 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sat Apr 02 14:06:20 2016 +0200 +++ b/src/gtkgui_helpers.py Sat Apr 02 14:22:02 2016 +0200 @@ -32,7 +32,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -from gi.repository import GObject +from gi.repository import GLib from gi.repository import Pango import os import sys @@ -51,7 +51,7 @@ def get_icon_pixmap(icon_name, size=16, quiet=False): try: return gtk_icon_theme.load_icon(icon_name, size, 0) - except GObject.GError as e: + except GLib.GError as e: if not quiet: log.error('Unable to load icon %s: %s' % (icon_name, str(e))) @@ -63,7 +63,7 @@ return "" else: return icon_info.get_filename() - except GObject.GError as e: + except GLib.GError as e: log.error("Unable to find icon %s: %s" % (icon_name, str(e))) import vcard @@ -419,7 +419,7 @@ pixbufloader.write(file_data) pixbufloader.close() pixbuf = pixbufloader.get_pixbuf() - except GObject.GError: # 'unknown image format' + except GLib.GError: # 'unknown image format' pixbufloader.close() pixbuf = None if want_type:

1 0

gajim: correctly decode string in view cert dialog
by Gajim 02 Apr '16

02 Apr '16

changeset a42659b8b057 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a42659b8b057 description: correctly decode string in view cert dialog diffstat: src/dialogs.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r c6d61947feab -r a42659b8b057 src/dialogs.py --- a/src/dialogs.py Thu Mar 31 22:46:44 2016 +0200 +++ b/src/dialogs.py Sat Apr 02 13:54:35 2016 +0200 @@ -5471,9 +5471,10 @@ 'sn': cert.get_serial_number(), 'icn': issuer.commonName, 'iorg': issuer.organizationName, 'iou': issuer.organizationalUnitName, - 'io': cert.get_notBefore(), 'eo': cert.get_notAfter(), - 'sha1': cert.digest('sha1'), - 'sha256': cert.digest('sha256')}) + 'io': cert.get_notBefore().decode('utf-8'), + 'eo': cert.get_notAfter().decode('utf-8'), + 'sha1': cert.digest('sha1').decode('utf-8'), + 'sha256': cert.digest('sha256').decode('utf-8')}) pix = gtkgui_helpers.get_icon_pixmap('application-certificate', size=32, quiet=True) if pix:

1 0

gajim: do not warn when tls cert changes for a valid one
by Gajim 02 Apr '16

02 Apr '16

changeset 939b6bc81b28 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=939b6bc81b28 description: do not warn when tls cert changes for a valid one diffstat: src/common/connection.py | 32 ++++++++++++++++---------------- src/gui_interface.py | 3 ++- 2 files changed, 18 insertions(+), 17 deletions(-) diffs (61 lines): diff -r a42659b8b057 -r 939b6bc81b28 src/common/connection.py --- a/src/common/connection.py Sat Apr 02 13:54:35 2016 +0200 +++ b/src/common/connection.py Sat Apr 02 14:06:20 2016 +0200 @@ -1461,28 +1461,28 @@ if saved_fingerprint_sha1: # Check sha1 fingerprint if fingerprint_sha1 != saved_fingerprint_sha1: - gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, certificate=cert, - new_fingerprint_sha1=fingerprint_sha1, - new_fingerprint_sha256=fingerprint_sha256)) - return True - else: - gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', fingerprint_sha1) + if not check_X509.check_certificate(cert, hostname): + gajim.nec.push_incoming_event(FingerprintErrorEvent( + None, conn=self, certificate=cert, + new_fingerprint_sha1=fingerprint_sha1, + new_fingerprint_sha256=fingerprint_sha256)) + return True + gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', + fingerprint_sha1) saved_fingerprint_sha256 = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha256') if saved_fingerprint_sha256: # Check sha256 fingerprint if fingerprint_sha256 != saved_fingerprint_sha256: - gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, certificate=con.Connection.ssl_certificate, - new_fingerprint_sha1=fingerprint_sha1, - new_fingerprint_sha256=fingerprint_sha256)) - return True - else: - gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha256', fingerprint_sha256) + if not check_X509.check_certificate(cert, hostname): + gajim.nec.push_incoming_event(FingerprintErrorEvent( + None, conn=self, certificate=cert, + new_fingerprint_sha1=fingerprint_sha1, + new_fingerprint_sha256=fingerprint_sha256)) + return True + gajim.config.set_per('accounts', self.name, + 'ssl_fingerprint_sha256', fingerprint_sha256) if not check_X509.check_certificate(cert, hostname) and \ '100' not in gajim.config.get_per('accounts', self.name, diff -r a42659b8b057 -r 939b6bc81b28 src/gui_interface.py --- a/src/gui_interface.py Sat Apr 02 13:54:35 2016 +0200 +++ b/src/gui_interface.py Sat Apr 02 14:06:20 2016 +0200 @@ -1419,7 +1419,8 @@ pritext = _('SSL certificate error') sectext = _('It seems the SSL certificate of account %(account)s has ' - 'changed or your connection is being hacked.\n\nOld SHA-1 fingerprint: ' + 'changed and is not valid or your connection is being hacked.\n\n' + 'Old SHA-1 fingerprint: ' '%(old_sha1)s\nOld SHA-256 fingerprint: %(old_sha256)s\n\n' 'New SHA-1 fingerprint: %(new_sha1)s\nNew SHA-256 fingerprint: ' '%(new_sha256)s\n\nDo you still want to connect '

1 0

gajim: better timestamp handling. Fixes #3818
by Gajim 31 Mar '16

31 Mar '16

changeset c6d61947feab in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c6d61947feab description: better timestamp handling. Fixes #3818 diffstat: src/common/connection_handlers_events.py | 6 +++++- src/common/helpers.py | 27 +++++++++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diffs (60 lines): diff -r fe7f3639b887 -r c6d61947feab src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Mar 30 21:19:13 2016 +0200 +++ b/src/common/connection_handlers_events.py Thu Mar 31 22:46:44 2016 +0200 @@ -94,7 +94,11 @@ self.gc_control = minimized.get(self.jid) def _generate_timestamp(self, tag): - tim = helpers.datetime_tuple(tag) + try: + tim = helpers.datetime_tuple(tag) + except Exception: + log.error('wrong timestamp, ignoring it: ' + tag) + tim = localtime() self.timestamp = localtime(timegm(tim)) def get_chatstate(self): diff -r fe7f3639b887 -r c6d61947feab src/common/helpers.py --- a/src/common/helpers.py Wed Mar 30 21:19:13 2016 +0200 +++ b/src/common/helpers.py Thu Mar 31 22:46:44 2016 +0200 @@ -44,6 +44,7 @@ from common import caps_cache import socket import time +import datetime from gi.repository import GObject from encodings.punycode import punycode_encode @@ -598,12 +599,26 @@ - XEP-082 datetime strings have all '-' cahrs removed to meet the above format. """ - timestamp = timestamp.split('.')[0] - timestamp = timestamp.replace('-', '') - timestamp = timestamp.replace('z', '') - timestamp = timestamp.replace('Z', '') - from time import strptime - return strptime(timestamp, '%Y%m%dT%H:%M:%S') + date, tim = timestamp.split('T', 1) + date = date.replace('-', '') + tim = tim.replace('z', '') + tim = tim.replace('Z', '') + zone = None + if '+' in tim: + sign = -1 + tim, zone = tim.split('+', 1) + if '-' in tim: + sign = 1 + tim, zone = tim.split('-', 1) + tim = tim.split('.')[0] + tim = time.strptime(date + 'T' + tim, '%Y%m%dT%H:%M:%S') + if zone: + tim = datetime.datetime.fromtimestamp(time.mktime(t)) + zone = strptime.time(zone, '%H:%M') + zone = datetime.timedelta(hours=zone.tm_hour, minutes=zone.tm_min) + tim += zone * sign + tim = tim.timetuple() + return tim from common import gajim if gajim.HAVE_PYCURL:

1 0

gajim: update video config from 0.16 to 1.0
by Gajim 30 Mar '16

30 Mar '16

changeset fe7f3639b887 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fe7f3639b887 description: update video config from 0.16 to 1.0 diffstat: src/common/config.py | 2 +- src/common/defs.py | 2 +- src/common/optparser.py | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diffs (48 lines): diff -r 406b4409fcb9 -r fe7f3639b887 src/common/config.py --- a/src/common/config.py Wed Mar 30 20:45:50 2016 +0200 +++ b/src/common/config.py Wed Mar 30 21:19:13 2016 +0200 @@ -303,7 +303,7 @@ 'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], 'audio_output_device': [opt_str, 'autoaudiosink'], - 'video_input_device': [opt_str, 'autovideosrc ! videoscale ! videoconvert'], + 'video_input_device': [opt_str, 'autovideosrc'], 'video_output_device': [opt_str, 'autovideosink'], 'video_framerate': [opt_str, '', _('Optionally fix jingle output video framerate. Example: 10/1 or 25/2')], 'video_size': [opt_str, '', _('Optionally resize jingle output video. Example: 320x240')], diff -r 406b4409fcb9 -r fe7f3639b887 src/common/defs.py --- a/src/common/defs.py Wed Mar 30 20:45:50 2016 +0200 +++ b/src/common/defs.py Wed Mar 30 21:19:13 2016 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.10' +version = '0.16.10.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, diff -r 406b4409fcb9 -r fe7f3639b887 src/common/optparser.py --- a/src/common/optparser.py Wed Mar 30 20:45:50 2016 +0200 +++ b/src/common/optparser.py Wed Mar 30 21:19:13 2016 +0200 @@ -231,6 +231,8 @@ self.update_config_to_01601() if old < [0, 16, 4, 1] and new >= [0, 16, 4, 1]: self.update_config_to_01641() + if old < [0, 16, 10, 1] and new >= [0, 16, 10, 1]: + self.update_config_to_016101() gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -936,3 +938,11 @@ gajim.config.set_per('accounts', account, 'connection_types', ' '.join(connection_types)) gajim.config.set('version', '0.16.4.1') + + def update_config_to_016101(self): + if 'video_input_device' in self.old_values: + if self.old_values['video_input_device'] == 'autovideosrc ! videoscale ! ffmpegcolorspace': + gajim.config.set('video_input_device', 'autovideosrc') + if self.old_values['video_input_device'] == 'videotestsrc is-live=true ! video/x-raw-yuv,framerate=10/1': + gajim.config.set('video_input_device', 'videotestsrc is-live=true ! video/x-raw,framerate=10/1') + gajim.config.set('version', '0.16.10.1')

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