Commits

commits@gajim.org

17632 discussions

gajim: coding style
by Fomin Denis 11 Jan '12

11 Jan '12

changeset 65196f5cc16d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=65196f5cc16d description: coding style diffstat: src/roster_window.py | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diffs (41 lines): diff -r 63c8ab421f3a -r 65196f5cc16d src/roster_window.py --- a/src/roster_window.py Sat Jan 07 15:41:53 2012 +0100 +++ b/src/roster_window.py Mon Jan 09 14:57:21 2012 +0400 @@ -4765,22 +4765,21 @@ """ Initialize opened and closed 'transport' iconset dict """ - if gajim.config.get('use_transports_iconsets'): - folder = os.path.join(helpers.get_transport_path(transport), - '16x16') - pixo, pixc = gtkgui_helpers.load_icons_meta() - self.transports_state_images['opened'][transport] = \ - gtkgui_helpers.load_iconset(folder, pixo, transport=True) - self.transports_state_images['closed'][transport] = \ - gtkgui_helpers.load_iconset(folder, pixc, transport=True) - folder = os.path.join(helpers.get_transport_path(transport), - '32x32') - self.transports_state_images['32'][transport] = \ - gtkgui_helpers.load_iconset(folder, transport=True) - folder = os.path.join(helpers.get_transport_path(transport), - '16x16') - self.transports_state_images['16'][transport] = \ - gtkgui_helpers.load_iconset(folder, transport=True) + if not gajim.config.get('use_transports_iconsets'): + return + + folder = os.path.join(helpers.get_transport_path(transport), '32x32') + self.transports_state_images['32'][transport] = \ + gtkgui_helpers.load_iconset(folder, transport=True) + folder = os.path.join(helpers.get_transport_path(transport), '16x16') + self.transports_state_images['16'][transport] = \ + gtkgui_helpers.load_iconset(folder, transport=True) + + pixo, pixc = gtkgui_helpers.load_icons_meta() + self.transports_state_images['opened'][transport] = \ + gtkgui_helpers.load_iconset(folder, pixo, transport=True) + self.transports_state_images['closed'][transport] = \ + gtkgui_helpers.load_iconset(folder, pixc, transport=True) def update_jabber_state_images(self): # Update the roster

1 0

gajim: fix OOB registration. Fixes #6957
by Yann Leboulanger 11 Jan '12

11 Jan '12

changeset 0fe298b10229 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0fe298b10229 description: fix OOB registration. Fixes #6957 diffstat: src/config.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diffs (33 lines): diff -r 65196f5cc16d -r 0fe298b10229 src/config.py --- a/src/config.py Mon Jan 09 14:57:21 2012 +0400 +++ b/src/config.py Mon Jan 09 17:40:02 2012 +0100 @@ -3803,23 +3803,24 @@ self.back_button.show() self.forward_button.show() self.is_form = obj.is_form + empty_config = True if obj.is_form: dataform = dataforms.ExtendForm(node=obj.config) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) + empty_config = False else: self.data_form_widget = FakeDataForm(obj.config) - empty_config = True for field in obj.config: if field in ('key', 'instructions', 'x', 'registered'): continue empty_config = False break - if empty_config: - self.forward_button.set_sensitive(False) - self.notebook.set_current_page(4) # show form page - return self.data_form_widget.show_all() self.xml.get_object('form_vbox').pack_start(self.data_form_widget) + if empty_config: + self.forward_button.set_sensitive(False) + self.notebook.set_current_page(4) # show form page + return self.ssl_fingerprint = obj.ssl_fingerprint self.ssl_cert = obj.ssl_cert if obj.ssl_msg:

1 0

gajim: [Pablo Mazzini] ask passphrase to user when using non-sas...
by Yann Leboulanger 11 Jan '12

11 Jan '12

changeset 63c8ab421f3a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=63c8ab421f3a description: [Pablo Mazzini] ask passphrase to user when using non-sasl authentication diffstat: src/common/xmpp/auth_nb.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 61fa1268d4a2 -r 63c8ab421f3a src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Sat Jan 07 12:00:04 2012 +0400 +++ b/src/common/xmpp/auth_nb.py Sat Jan 07 15:41:53 2012 +0100 @@ -567,8 +567,19 @@ else: log.warn("Secure methods unsupported, performing plain text \ authentication") - query.setTagData('password', self.password) self._method = 'plain' + self._owner._caller.get_password(self._on_password, self._method) + return + resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, + func=self._on_auth) + + def _on_password(self, password): + self.password = '' if password is None else password + iq=Iq('set', NS_AUTH) + query = iq.getTag('query') + query.setTagData('username', self.user) + query.setTagData('resource', self.resource) + query.setTagData('password', self.password) resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, func=self._on_auth)

1 0

gajim: Prevent traceback
by Fomin Denis 11 Jan '12

11 Jan '12

changeset 61fa1268d4a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=61fa1268d4a2 description: Prevent traceback diffstat: src/plugins/pluginmanager.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r e83de0e87e88 -r 61fa1268d4a2 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Jan 06 09:45:11 2012 +0100 +++ b/src/plugins/pluginmanager.py Sat Jan 07 12:00:04 2012 +0400 @@ -475,7 +475,10 @@ except TypeError, type_error: # set plugin localization - module_attr._ = _ + try: + module_attr._ = _ + except AttributeError, type_error: + pass except ConfigParser.NoOptionError, type_error: # all fields are required log.debug('%s : %s' % (module_attr_name,

1 0

gajim: check ssl certificate against hostname only if we use sec...
by Yann Leboulanger 11 Jan '12

11 Jan '12

changeset e83de0e87e88 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e83de0e87e88 description: check ssl certificate against hostname only if we use secured connection. Fixes #7071 diffstat: src/common/connection.py | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diffs (42 lines): diff -r 4d8c6e53cd8f -r e83de0e87e88 src/common/connection.py --- a/src/common/connection.py Thu Jan 05 20:09:33 2012 +0100 +++ b/src/common/connection.py Fri Jan 06 09:45:11 2012 +0100 @@ -1315,24 +1315,22 @@ else: gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1) - if not check_X509.check_certificate(con.Connection.ssl_certificate, - hostname) and '100' not in gajim.config.get_per('accounts', self.name, - 'ignore_ssl_errors').split(): - txt = _('The authenticity of the %s certificate could be invalid.' - '\nThe certificate does not cover this domain.') % hostname - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=txt, error_num=100, cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, - certificate=con.Connection.ssl_certificate)) - return True + if not check_X509.check_certificate(con.Connection.ssl_certificate, + hostname) and '100' not in gajim.config.get_per('accounts', + self.name, 'ignore_ssl_errors').split(): + txt = _('The authenticity of the %s certificate could be ' + 'invalid.\nThe certificate does not cover this domain.') % \ + hostname + gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, + error_text=txt, error_num=100, + cert=con.Connection.ssl_cert_pem, + fingerprint=con.Connection.ssl_fingerprint_sha1, + certificate=con.Connection.ssl_certificate)) + return True self._register_handlers(con, con_type) - con.auth( - user=name, - password=self.password, - resource=self.server_resource, - sasl=1, - on_auth=self.__on_auth) + con.auth(user=name, password=self.password, + resource=self.server_resource, sasl=1, on_auth=self.__on_auth) def ssl_certificate_accepted(self): if not self.connection:

1 0

gajim: check in feature window if pyopenssl >= 0.12 and if pyasn...
by Yann Leboulanger 11 Jan '12

11 Jan '12

changeset ff62e65be743 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ff62e65be743 description: check in feature window if pyopenssl >= 0.12 and if pyasn1 is available diffstat: src/features_window.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r cd6948ca93cb -r ff62e65be743 src/features_window.py --- a/src/features_window.py Thu Jan 05 11:56:22 2012 +0100 +++ b/src/features_window.py Thu Jan 05 13:50:15 2012 +0100 @@ -169,6 +169,11 @@ try: import OpenSSL.SSL import OpenSSL.crypto + ver = OpenSSL.__version__ + ver_l = [int(i) for i in ver.split('.')] + if ver_l < [0, 12]: + raise ImportError + import pyasn1 except Exception: return False return True

1 0

gajim: make /status /away and /back commands apply to connected ...
by Yann Leboulanger 11 Jan '12

11 Jan '12

changeset 4d8c6e53cd8f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4d8c6e53cd8f description: make /status /away and /back commands apply to connected and synchronized accounts. Fixes #7070 diffstat: src/command_system/implementation/standard.py | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diffs (48 lines): diff -r ff62e65be743 -r 4d8c6e53cd8f src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Jan 05 13:50:15 2012 +0100 +++ b/src/command_system/implementation/standard.py Thu Jan 05 20:09:33 2012 +0100 @@ -125,6 +125,17 @@ self.echo(formatted) + def _get_connected_accounts(self): + conns = [] + for conn in gajim.connections.itervalues(): + if not gajim.config.get_per('accounts', conn.name, + 'sync_with_global_status'): + continue + if conn.connected <= 2: + continue + conns.append(conn) + return conns + @command(raw=True, empty=True) @doc(_(""" Set current the status @@ -135,7 +146,7 @@ def status(self, status, message): if status not in ('online', 'away', 'chat', 'xa', 'dnd'): raise CommandError("Invalid status given") - for connection in gajim.connections.itervalues(): + for connection in self._get_connected_accounts(): connection.change_status(status, message) @command(raw=True, empty=True) @@ -143,7 +154,7 @@ def away(self, message): if not message: message = _("Away") - for connection in gajim.connections.itervalues(): + for connection in self._get_connected_accounts(): connection.change_status('away', message) @command('back', raw=True, empty=True) @@ -151,7 +162,7 @@ def online(self, message): if not message: message = _("Available") - for connection in gajim.connections.itervalues(): + for connection in self._get_connected_accounts(): connection.change_status('online', message) class StandardCommonChatCommands(CommandContainer):

1 0

gajim: generate POTFILES.skip in autogen.sh to skip plugins from...
by Yann Leboulanger 11 Jan '12

11 Jan '12

changeset cd6948ca93cb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cd6948ca93cb description: generate POTFILES.skip in autogen.sh to skip plugins from translation. add command system files to translated files. Fixes #7068 diffstat: autogen.sh | 6 ++++-- po/POTFILES.skip | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diffs (23 lines): diff -r 7582f60f497b -r cd6948ca93cb autogen.sh --- a/autogen.sh Wed Jan 04 11:38:09 2012 +0100 +++ b/autogen.sh Thu Jan 05 11:56:22 2012 +0100 @@ -20,8 +20,10 @@ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ && ls -1 data/gajim.desktop.in.in \ - src/*py src/common/*py src/common/zeroconf/*.py src/plugins/*.py| grep -v ipython_view.py >> \ - po/POTFILES.in || exit 1 + src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ + po/POTFILES.in \ + && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip \ + && ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip || exit 1 if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***" echo "See README.html for build requirements." diff -r 7582f60f497b -r cd6948ca93cb po/POTFILES.skip --- a/po/POTFILES.skip Wed Jan 04 11:38:09 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -data/gajim.desktop.in -src/eggtrayicon.c -src/ipython_view.py

1 0

gajim: check that pyopenssl > 0.12 is installed before using fon...
by Yann Leboulanger 11 Jan '12

11 Jan '12

changeset 7582f60f497b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7582f60f497b description: check that pyopenssl > 0.12 is installed before using fonctions available after this version diffstat: src/common/check_X509.py | 4 ++++ src/features_window.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diffs (28 lines): diff -r 6f3537ffbac2 -r 7582f60f497b src/common/check_X509.py --- a/src/common/check_X509.py Tue Jan 03 20:17:33 2012 +0100 +++ b/src/common/check_X509.py Wed Jan 04 11:38:09 2012 +0100 @@ -4,6 +4,10 @@ try: import OpenSSL.SSL import OpenSSL.crypto + ver = OpenSSL.__version__ + ver_l = [int(i) for i in ver.split('.')] + if ver_l < [0, 12]: + raise ImportError from pyasn1.type import univ, constraint, char, namedtype, tag from pyasn1.codec.der.decoder import decode from common.helpers import prep, InvalidFormat diff -r 6f3537ffbac2 -r 7582f60f497b src/features_window.py --- a/src/features_window.py Tue Jan 03 20:17:33 2012 +0100 +++ b/src/features_window.py Wed Jan 04 11:38:09 2012 +0100 @@ -49,8 +49,8 @@ self.features = { _('SSL certificate validation'): (self.pyopenssl_available, _('A library used to validate server certificates to ensure a secure connection.'), - _('Requires python-pyopenssl.'), - _('Requires python-pyopenssl.')), + _('Requires python-pyopenssl > 0.12 and pyasn1.'), + _('Requires python-pyopenssl > 0.12 and pyasn1.')), _('Bonjour / Zeroconf'): (self.zeroconf_available, _('Serverless chatting with autodetected clients in a local network.'), _('Requires python-avahi.'),

1 0

gajim: use 'login' keyring as default keyring instead of 'defaul...
by Yann Leboulanger 11 Jan '12

11 Jan '12

changeset 6f3537ffbac2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6f3537ffbac2 description: use 'login' keyring as default keyring instead of 'default'. Fixes #7067 diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1c55719e6b17 -r 6f3537ffbac2 src/common/passwords.py --- a/src/common/passwords.py Mon Jan 02 17:01:31 2012 +0100 +++ b/src/common/passwords.py Tue Jan 03 20:17:33 2012 +0100 @@ -63,7 +63,7 @@ def __init__(self): self.keyring = gnomekeyring.get_default_keyring_sync() if self.keyring is None: - self.keyring = 'default' + self.keyring = 'login' try: gnomekeyring.create_sync(self.keyring, None) except gnomekeyring.AlreadyExistsError:

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