Commits

commits@gajim.org

17632 discussions

gajim: New option 'authentication_mechanisms'
by Gajim 27 Mar '14

27 Mar '14

changeset b5f267679cbe in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b5f267679cbe description: New option 'authentication_mechanisms' Fixes #7671 diffstat: src/common/config.py | 1 + src/common/connection.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diffs (31 lines): diff -r b4648e4208c1 -r b5f267679cbe src/common/config.py --- a/src/common/config.py Fri Feb 28 11:02:26 2014 +0100 +++ b/src/common/config.py Sat Mar 01 21:16:24 2014 +0100 @@ -351,6 +351,7 @@ 'connection_types': [ opt_str, 'tls ssl plain', _('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') ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], diff -r b4648e4208c1 -r b5f267679cbe src/common/connection.py --- a/src/common/connection.py Fri Feb 28 11:02:26 2014 +0100 +++ b/src/common/connection.py Sat Mar 01 21:16:24 2014 +0100 @@ -1465,8 +1465,15 @@ return True self._register_handlers(con, con_type) + auth_mechs = gajim.config.get_per('accounts', self.name, 'authentication_mechanisms') + auth_mechs = auth_mechs.split() + for mech in auth_mechs: + if mech not in nbxmpp.auth_nb.SASL_AUTHENTICATION_MECHANISMS | set(['XEP-0078']): + log.warning("Unknown authentication mechanisms %s" % mech) + if len(auth_mechs) == 0: + auth_mechs = None con.auth(user=name, password=self.password, - resource=self.server_resource, sasl=1, on_auth=self.__on_auth) + resource=self.server_resource, sasl=True, on_auth=self.__on_auth, auth_mechs=auth_mechs) def ssl_certificate_accepted(self): if not self.connection:

1 0

gajim: we now require python-nbxmpp 0.3.3
by Gajim 27 Mar '14

27 Mar '14

changeset b95ba89c5076 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b95ba89c5076 description: we now require python-nbxmpp 0.3.3 diffstat: src/gajim.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (18 lines): diff -r b5f267679cbe -r b95ba89c5076 src/gajim.py --- a/src/gajim.py Sat Mar 01 21:16:24 2014 +0100 +++ b/src/gajim.py Sat Mar 01 21:29:46 2014 +0100 @@ -70,11 +70,11 @@ try: from distutils.version import LooseVersion as V - if V(nbxmpp.__version__) < V("0.3.1"): - print('Gajim needs python-nbxmpp > 0.3.1 to run. Quiting...') + if V(nbxmpp.__version__) < V("0.3.3"): + print('Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...') sys.exit() except: - print('Gajim needs python-nbxmpp > 0.3.1 to run. Quiting...') + print('Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...') sys.exit() #from common import demandimport

1 0

gajim: print message to console in correct encoding. Fixes #7652
by Gajim 27 Mar '14

27 Mar '14

changeset 6cf0b3311453 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6cf0b3311453 description: print message to console in correct encoding. Fixes #7652 diffstat: src/gajim.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r b95ba89c5076 -r 6cf0b3311453 src/gajim.py --- a/src/gajim.py Sat Mar 01 21:29:46 2014 +0100 +++ b/src/gajim.py Sun Mar 02 11:26:52 2014 +0100 @@ -147,7 +147,7 @@ sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print(_('Usage:') + \ + out = _('Usage:') + \ '\n gajim [options] filename\n\n' + \ _('Options:') + \ '\n -h, --help ' + \ @@ -161,7 +161,8 @@ '\n -c, --config-path ' + \ _('Set configuration directory') + \ '\n -l, --loglevel ' + \ - _('Configure logging system') + '\n') + _('Configure logging system') + '\n' + print(out.encode(locale.getpreferredencoding())) sys.exit() elif o in ('-q', '--quiet'): logging_helpers.set_quiet()

1 0

gajim: use sys.stderr.isatty() to decide if we use colors in log...
by Gajim 27 Mar '14

27 Mar '14

changeset bcd3a4356f13 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bcd3a4356f13 description: use sys.stderr.isatty() to decide if we use colors in log output or not. diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6cf0b3311453 -r bcd3a4356f13 src/gajim.py --- a/src/gajim.py Sun Mar 02 11:26:52 2014 +0100 +++ b/src/gajim.py Sat Mar 08 10:07:40 2014 +0100 @@ -115,7 +115,7 @@ sys.path.append('.') from common import logging_helpers -logging_helpers.init('TERM' in os.environ) +logging_helpers.init(sys.stderr.isatty()) import logging # gajim.gui or gajim.gtk more appropriate ?

1 0

gajim: fix var name. Fixes #7668
by Gajim 27 Mar '14

27 Mar '14

changeset 4687645c49bc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4687645c49bc description: fix var name. Fixes #7668 diffstat: src/common/connection_handlers_events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r bcd3a4356f13 -r 4687645c49bc src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Mar 08 10:07:40 2014 +0100 +++ b/src/common/connection_handlers_events.py Sat Mar 08 12:19:15 2014 +0100 @@ -1636,8 +1636,8 @@ self.ssl_msg = '' if self.errnum > 0: from common.connection import ssl_error - self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ - self.errnum) + self.ssl_msg = ssl_error.get(self.errnum, + _('Unknown SSL error: %d') % self.errnum) self.ssl_cert = '' self.ssl_fingerprint_sha1 = '' self.ssl_fingerprint_sha256 = ''

1 0

gajim: catch errors that could appear when running plugins gui e...
by Gajim 27 Mar '14

27 Mar '14

changeset b126752c304b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b126752c304b description: catch errors that could appear when running plugins gui extention points diffstat: src/plugins/pluginmanager.py | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diffs (43 lines): diff -r 4687645c49bc -r b126752c304b src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Mar 08 12:19:15 2014 +0100 +++ b/src/plugins/pluginmanager.py Sun Mar 09 10:19:24 2014 +0100 @@ -255,7 +255,11 @@ if gui_extpoint_name in self.gui_extension_points_handlers: for handlers in self.gui_extension_points_handlers[ gui_extpoint_name]: - handlers[0](*args) + try: + handlers[0](*args) + except Exception, e: + log.warning('Error executing %s', handlers[0], + exc_info=True) def _register_events_handlers_in_ged(self, plugin): for event_name, handler in plugin.events_handlers.items(): @@ -326,7 +330,11 @@ gui_extpoint_name]: handler = gui_extpoint_handlers[1] if handler: - handler(*gui_extension_point_args) + try: + handler(*gui_extension_point_args) + except Exception, e: + log.warning('Error executing %s', handler, + exc_info=True) self._remove_events_handler_from_ged(plugin) self._remove_network_events_from_nec(plugin) @@ -357,7 +365,12 @@ gui_extpoint_name]: handler = gui_extpoint_handlers[0] if handler: - handler(*gui_extension_point_args) + try: + handler(*gui_extension_point_args) + except Exception, e: + log.warning('Error executing %s', handler, + exc_info=True) + @log_calls('PluginManager') def _activate_all_plugins(self):

1 0

gajim: py2 -> py3
by Gajim 27 Mar '14

27 Mar '14

changeset a46891c400bc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a46891c400bc description: py2 -> py3 diffstat: src/plugins/pluginmanager.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r b126752c304b -r a46891c400bc src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Mar 09 10:19:24 2014 +0100 +++ b/src/plugins/pluginmanager.py Thu Mar 27 12:42:19 2014 +0100 @@ -257,7 +257,7 @@ gui_extpoint_name]: try: handlers[0](*args) - except Exception, e: + except Exception as e: log.warning('Error executing %s', handlers[0], exc_info=True) @@ -332,7 +332,7 @@ if handler: try: handler(*gui_extension_point_args) - except Exception, e: + except Exception as e: log.warning('Error executing %s', handler, exc_info=True) @@ -367,7 +367,7 @@ if handler: try: handler(*gui_extension_point_args) - except Exception, e: + except Exception as e: log.warning('Error executing %s', handler, exc_info=True)

1 0

gajim: make audio work under windows
by Gajim 27 Mar '14

27 Mar '14

changeset 8898f392acb2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8898f392acb2 description: make audio work under windows diffstat: gajim.nsi | 24 +++++++++++++++++++----- setup_win32.py | 5 +++++ src/common/gajim.py | 4 ++++ src/gajim.py | 6 ++++++ 4 files changed, 34 insertions(+), 5 deletions(-) diffs (118 lines): diff -r a46891c400bc -r 8898f392acb2 gajim.nsi --- a/gajim.nsi Thu Mar 27 12:42:19 2014 +0100 +++ b/gajim.nsi Sun Mar 09 10:25:26 2014 +0100 @@ -164,22 +164,29 @@ File "bin\atk.pyd" File "bin\bz2.pyd" File "bin\cairo._cairo.pyd" - File "bin\Crypto.Cipher.AES.pyd" - File "bin\Crypto.Hash.SHA256.pyd" + File "bin\Crypto.Cipher._AES.pyd" + File "bin\Crypto.Cipher._DES.pyd" + File "bin\Crypto.Cipher._DES3.pyd" + File "bin\Crypto.Hash._SHA256.pyd" File "bin\Crypto.Random.OSRNG.winrandom.pyd" File "bin\Crypto.Util._counter.pyd" File "bin\Crypto.Util.strxor.pyd" + File "bin\farstream.pyd" File "bin\gajim.exe" File "bin\gio._gio.pyd" File "bin\glib._glib.pyd" File "bin\gobject._gobject.pyd" File "bin\goocanvas.pyd" + File "bin\gst._gst.pyd" + File "bin\gst.interfaces.pyd" File "bin\gtk._gtk.pyd" File "bin\history_manager.exe" File "bin\OpenSSL.crypto.pyd" File "bin\libeay32.dll" File "bin\libgoocanvas-3.dll" File "bin\library.zip" + File "bin\libxml2mod.pyd" + File "bin\libxmlmods.libxml2mod.pyd" File "bin\pangocairo.pyd" File "bin\pango.pyd" File "bin\pycurl.pyd" @@ -544,20 +551,27 @@ Delete "$INSTDIR\bin\atk.pyd" Delete "$INSTDIR\bin\bz2.pyd" Delete "$INSTDIR\bin\cairo._cairo.pyd" - Delete "$INSTDIR\bin\Crypto.Cipher.AES.pyd" - Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd" + Delete "$INSTDIR\bin\Crypto.Cipher._AES.pyd" + Delete "$INSTDIR\bin\Crypto.Cipher._DES.pyd" + Delete "$INSTDIR\bin\Crypto.Cipher._DES3.pyd" + Delete "$INSTDIR\bin\Crypto.Hash._SHA256.pyd" Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd" Delete "$INSTDIR\bin\Crypto.Util._counter.pyd" - Delete "$INSTDIR\bin\gajim.exe" + Delete "$INSTDIR\bin\farstream.pyd" + Delete "$INSTDIR\bin\gajim.exe" Delete "$INSTDIR\bin\gio._gio.pyd" Delete "$INSTDIR\bin\glib._glib.pyd" Delete "$INSTDIR\bin\gobject._gobject.pyd" Delete "$INSTDIR\bin\goocanvas.pyd" + Delete "$INSTDIR\bin\gst._gst.pyd" + Delete "$INSTDIR\bin\gst.interfaces.pyd" Delete "$INSTDIR\bin\gtk._gtk.pyd" Delete "$INSTDIR\bin\history_manager.exe" Delete "$INSTDIR\bin\libeay32.dll" Delete "$INSTDIR\bin\libgoocanvas-3.dll" Delete "$INSTDIR\bin\library.zip" + Delete "$INSTDIR\bin\libxml2mod.pyd" + Delete "$INSTDIR\bin\libxmlmods.libxml2mod.pyd" Delete "$INSTDIR\bin\OpenSSL.crypto.pyd" Delete "$INSTDIR\bin\OpenSSL.rand.pyd" Delete "$INSTDIR\bin\OpenSSL.SSL.pyd" diff -r a46891c400bc -r 8898f392acb2 setup_win32.py --- a/setup_win32.py Thu Mar 27 12:42:19 2014 +0100 +++ b/setup_win32.py Sun Mar 09 10:25:26 2014 +0100 @@ -44,6 +44,11 @@ 'libgtk-win32-2.0-0.dll', 'libpango-1.0-0.dll', 'libpangowin32-1.0-0.dll', 'libcairo-2.dll', 'libpangocairo-1.0-0.dll', 'libpangoft2-1.0-0.dll', + 'libfarstream-0.1-0.dll', 'libgcc_s_dw2-1.dll', + 'libgstbase-0.10-0.dll', 'libgstcontroller-0.10-0.dll', + 'libgstdataprotocol-0.10-0.dll', 'libgstinterfaces-0.10-0.dll', + 'libgstnet-0.10-0.dll', 'libgstreamer-0.10-0.dll', + 'libiconv-2.dll', 'libxml2.dll', 'libxml2-2.dll', ], } } diff -r a46891c400bc -r 8898f392acb2 src/common/gajim.py --- a/src/common/gajim.py Thu Mar 27 12:42:19 2014 +0100 +++ b/src/common/gajim.py Sun Mar 09 10:25:26 2014 +0100 @@ -28,6 +28,7 @@ ## import sys +import os import logging import locale @@ -184,6 +185,9 @@ HAVE_FARSTREAM = True try: + if os.name == 'nt' + os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' + os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' import gi gi.require_version('Farstream', '0.2') from gi.repository import Farstream diff -r a46891c400bc -r 8898f392acb2 src/gajim.py --- a/src/gajim.py Thu Mar 27 12:42:19 2014 +0100 +++ b/src/gajim.py Sun Mar 09 10:25:26 2014 +0100 @@ -62,6 +62,12 @@ new_list.insert(0, os.path.join(os.getcwd(), 'gtk', 'bin')) os.environ['PATH'] = ';'.join(new_list) + # Needs to be imported very early to not crash Gajim on exit. + try: + __import__('libxml2mod') + except ImportError: + pass + try: import nbxmpp except ImportError:

1 0

gajim: prevent traceback. Fixes #7592
by Gajim 27 Mar '14

27 Mar '14

changeset 727011dd6180 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=727011dd6180 description: prevent traceback. Fixes #7592 diffstat: src/tooltips.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r eac993c50375 -r 727011dd6180 src/tooltips.py --- a/src/tooltips.py Wed Feb 12 14:04:19 2014 +0100 +++ b/src/tooltips.py Sat Feb 15 21:28:39 2014 +0100 @@ -776,7 +776,7 @@ else: status = _('Not started') properties.append((_('Status: '), status)) - file_desc = file_props.desc + file_desc = file_props.desc or '' properties.append((_('Description: '), GLib.markup_escape_text( file_desc))) while properties:

1 0

gajim: copy big_brother_groups correctly when making metcontacts...
by Gajim 27 Mar '14

27 Mar '14

changeset 467ca96b694a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=467ca96b694a description: copy big_brother_groups correctly when making metcontacts. Fixes #7574 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 727011dd6180 -r 467ca96b694a src/roster_window.py --- a/src/roster_window.py Sat Feb 15 21:28:39 2014 +0100 +++ b/src/roster_window.py Sun Feb 16 11:51:19 2014 +0100 @@ -360,7 +360,7 @@ assert len(parent_iters) > 0, 'Big brother is not yet in roster!' # Do not confuse get_contact_iter: Sync groups of family members - contact.groups = big_brother_contact.get_shown_groups()[:] + contact.groups = big_brother_contact.groups[:] for child_iter in parent_iters: it = self.model.append(child_iter, [None,

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