Commits March 2014

commits@gajim.org

3 participants
103 discussions

gajim: remove outdated autopackage files
by Gajim 27 Mar '14

27 Mar '14

changeset 38c9e5472304 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=38c9e5472304 description: remove outdated autopackage files diffstat: autopackage/(a)dnspython.org/dnspython/skeleton.1 | 22 --- autopackage/(a)glade.gnome.org/libglade/skeleton.1 | 13 -- autopackage/(a)gnome.org/pyglade/skeleton.1 | 29 ---- autopackage/(a)gnome.org/pygtk/skeleton.1 | 24 --- autopackage/(a)gtk.org/gtk/skeleton.1 | 25 ---- autopackage/(a)gtkspell.sourceforge.net/gtkspell/skeleton.1 | 16 -- autopackage/(a)pydns.sourceforge.net/pydns/skeleton.1 | 22 --- autopackage/(a)pysqlite.org/pysqlite/skeleton.1 | 22 --- autopackage/(a)python.org/python-xml/skeleton.1 | 21 --- autopackage/(a)python.org/python/skeleton.1 | 20 --- autopackage/default.apspec | 93 --------------- 11 files changed, 0 insertions(+), 307 deletions(-) diffs (truncated from 351 to 300 lines): diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)dnspython.org/dnspython/skeleton.1 --- a/autopackage/(a)dnspython.org/dnspython/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @dnspython.org/dnspython -DisplayName: dnspython is a DNS toolkit for Python -ShortName: dnspython -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] -Returns the full version e.g 1.3.3 - -[Test] -INTERFACE_VERSIONS=`python - <<EOF -try: - import dns.version - print dns.version.version -except: - pass -EOF -` -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)glade.gnome.org/libglade/skeleton.1 --- a/autopackage/(a)glade.gnome.org/libglade/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -[Meta] -RootName: @glade.gnome.org/libglade -DisplayName: Glade user interface loader library -ShortName: libglade -Skeleton-Author: Mike Hearn <mike(a)theoretic.com> -Skeleton-Version: 1 - -[Notes] -This skeleton only detects libglade1 and 2, which are assigned interface numbers 1 and 2 respectively - -[Test] -testForLib libglade.so.0 && INTERFACE_VERSIONS="1" -testForLib libglade-2.0.so.0 && INTERFACE_VERSIONS="2 $INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)gnome.org/pyglade/skeleton.1 --- a/autopackage/(a)gnome.org/pyglade/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @gnome.org/pyglade -DisplayName: Python bindings for Glade -ShortName: pyglade -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] -Pyglade is bundled within pygtk sources so they have the same versions - -[Test] -testForPythonModule gtk.glade -if [[ "$?" != "0" ]]; then - INTERFACE_VERSIONS="" -else - INTERFACE_VERSIONS=`python - <<EOF -try: - import pygtk - import gtk.glade - print "%i.%i" % (gtk.pygtk_version[0], gtk.pygtk_version[1]) -except: - pass -EOF -` -fi - -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)gnome.org/pygtk/skeleton.1 --- a/autopackage/(a)gnome.org/pygtk/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @gnome.org/pygtk -DisplayName: Python bindings for GTK+ -ShortName: pygtk -Skeleton-Author: Tom Cato Amundsen <tca(a)gnu.org> -Skeleton-Version: 1 - -[Notes] -Matchces GTK2 interface versioning - -[Test] -INTERFACE_VERSIONS=`python - <<EOF -try: - import pygtk - pygtk.require("2.0") - import gtk - print "%i.%i" % (gtk.pygtk_version[0], gtk.pygtk_version[1]) -except: - pass -EOF -` -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)gtk.org/gtk/skeleton.1 --- a/autopackage/(a)gtk.org/gtk/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @gtk.org/gtk -DisplayName: GTK+ user interface toolkit -ShortName: gtk+ -Skeleton-Author: Hongli Lai <h.lai(a)chello.nl> -Skeleton-Version: 1 - -[Notes] -Interface versions correspond to GTK released versions, as GTK version -numbering sensibly tracks the interfaces, ie GTK2.2 has an interface -version of 2.2, not 2.1 as would be the normal rules. - -Earliest detected version is GTK 1.2 - -[Test] -testForLib libgtk-1.2.so.0 && INTERFACE_VERSIONS=" 1.2" -gtk2versions=`testForLib -v libgtk-x11-2.0.so.0` -for v in $gtk2versions; do - minor=$( IFS=.; v=( $v ); echo ${v[1]} ) - minor=$[ $minor / 100 ] - INTERFACE_VERSIONS="2.$minor $INTERFACE_VERSIONS" -done -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" # this time...... diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)gtkspell.sourceforge.net/gtkspell/skeleton.1 --- a/autopackage/(a)gtkspell.sourceforge.net/gtkspell/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @gtkspell.sourceforge.net/gtkspell -DisplayName: GtkSpell Spell Checking Library -ShortName: gtkspell -Skeleton-Author: Timothy Ringenbach <omarvo(a)hotmail.com> -Skeleton-Version: 1 -Repository: http://www.gajim.org/downloads/gtkspell.xml - -[Notes] -This skeleton does not set SOFTWARE_VERSIONS -Interface versions start at 0. - -[Test] -INTERFACE_VERSIONS=`testForLib -i libgtkspell.so` diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)pydns.sourceforge.net/pydns/skeleton.1 --- a/autopackage/(a)pydns.sourceforge.net/pydns/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @pydns.sourceforge.net/pydns -DisplayName: PyDNS provides a python module for performing DNS queries -ShortName: pydns -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] - - -[Test] -INTERFACE_VERSIONS=`python - <<EOF -try: - import DNS - print DNS.__version__ -except: - pass -EOF -` -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)pysqlite.org/pysqlite/skeleton.1 --- a/autopackage/(a)pysqlite.org/pysqlite/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @pysqlite.org/pysqlite -DisplayName: Python interface for the SQLite -ShortName: pysqlite -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] -pysqlite is a Python DB-API 2.0 interface for the SQLite embedded relational database engine - -[Test] -INTERFACE_VERSIONS=`python - <<EOF -try: - import pysqlite2.dbapi2 as sql - print sql.version -except: - pass -EOF -` -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)python.org/python-xml/skeleton.1 --- a/autopackage/(a)python.org/python-xml/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @python.org/python-xml -DisplayName: Python bindings for XML -ShortName: python-xml -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] -Distros like SuSE split some features of core python (like xml) to python-xml e.t.c -So python-xml must have the same versions as python - -[Test] -SOFTWARE_VERSIONS=$( locateCommand python -V 2>&1 | cut -f2 -d' ' ) -testForPythonModule xml -if [[ "$?" != "0" ]]; then - INTERFACE_VERSIONS="" -else - INTERFACE_VERSIONS=$( echo $SOFTWARE_VERSIONS | awk -F. '{print $1 "." $2}' ) -fi diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)python.org/python/skeleton.1 --- a/autopackage/(a)python.org/python/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -[Meta] -RootName: @python.org/python -DisplayName: Python language runtime -ShortName: python -Skeleton-Author: Mike Hearn <mike(a)theoretic.com> -Skeleton-Version: 1 - -[Notes] -INTERFACE_VERSIONS are set to match the currently installed version using the "python" executable name. -For instance, python 2.2 causes INTERFACE_VERSIONS to contain "2.2 2.1 2.0". This skeleton assumes python1 and python2 are not parallel installed. -SOFTWARE_VERSIONS is set to the result of python -V - -[Test] -SOFTWARE_VERSIONS=$( locateCommand python -V 2>&1 | cut -f2 -d' ' ) -if [[ "$?" != "0" ]]; then - INTERFACE_VERSIONS="" -else - INTERFACE_VERSIONS=$( echo $SOFTWARE_VERSIONS | awk -F. '{print $1 "." $2}' ) -fi - diff -r 792ee48ab707 -r 38c9e5472304 autopackage/default.apspec --- a/autopackage/default.apspec Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -# -*-shell-script-*- - -[Meta] -RootName: @gajim.org/gajim:$SOFTWAREVERSION -DisplayName: Gajim Jabber Client -ShortName: gajim -Maintainer: The Gajim Developers <gajim-devel-subscribe(a)gajim.org> -Packager: Filippos Papadopoulos <psybases(a)gmail.com> -Summary: Gajim is a Jabber client written in Python. -URL: http://www.gajim.org/ -License: GNU General Public License, Version 2 -SoftwareVersion: 0.12-alpha1 -AutopackageTarget: 1.0 -PackageVersion: 1 - -# Only uncomment InterfaceVersion if your package exposes interfaces to other software, -# for instance if it includes DSOs or python/perl modules. See the developer guide for more info, -# or ask on autopackage-dev if you don't understand interface versioning in autopackage. -# -# InterfaceVersion: 0.0 - -[Description] -Gajim is a jabber client written in PyGTK. The goal of Gajim is to provide a full featured and easy to use xmpp -client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. Gajim is -released under the GNU General Public License. Features: Tabbed chat windows, Groupchat support (with MUC protocol), -File tranfers, Emoticons, URL grabber, Systray icon, GPG support, Multiple accounts support and much more! - - - -[BuildPrepare] -prepareBuild - - -[BuildUnprepare] -unprepareBuild - - -[Imports] -echo '*' | import -import <<EOF -EOF -

1 0

gajim: fix some typos
by Gajim 27 Mar '14

27 Mar '14

changeset 3cd8c331000b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3cd8c331000b description: fix some typos diffstat: src/common/gajim.py | 2 +- src/common/jingle_content.py | 2 +- src/common/jingle_xtls.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diffs (36 lines): diff -r 38c9e5472304 -r 3cd8c331000b src/common/gajim.py --- a/src/common/gajim.py Sat Mar 15 11:23:27 2014 +0100 +++ b/src/common/gajim.py Thu Mar 27 13:21:28 2014 +0100 @@ -185,7 +185,7 @@ HAVE_FARSTREAM = True try: - if os.name == 'nt' + 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 diff -r 38c9e5472304 -r 3cd8c331000b src/common/jingle_content.py --- a/src/common/jingle_content.py Sat Mar 15 11:23:27 2014 +0100 +++ b/src/common/jingle_content.py Thu Mar 27 13:21:28 2014 +0100 @@ -223,7 +223,7 @@ if cert: try: digest_algo = cert.get_signature_algorithm().split('With')[0] - except AttributeError, e: + except AttributeError as e: # Old py-OpenSSL is missing get_signature_algorithm digest_algo = "sha256" security.addChild('fingerprint').addData(cert.digest( diff -r 38c9e5472304 -r 3cd8c331000b src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Sat Mar 15 11:23:27 2014 +0100 +++ b/src/common/jingle_xtls.py Thu Mar 27 13:21:28 2014 +0100 @@ -194,7 +194,7 @@ if cert: try: digest_algo = cert.get_signature_algorithm().split('With')[0] - except AttributeError, e: + except AttributeError as e: # Old py-OpenSSL is missing get_signature_algorithm digest_algo = "sha256" if cert.digest(digest_algo) == fingerprint:

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2014