Commits September 2011

commits@gajim.org

2 participants
107 discussions

gajim: create fake gajim.plugin_manager.gui_extension_point meth...
by Fomin Denis 30 Sep '11

30 Sep '11

changeset fa253547651b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa253547651b description: create fake gajim.plugin_manager.gui_extension_point method for htmltextview.py testing diffstat: src/htmltextview.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 85c130b04f55 -r fa253547651b src/htmltextview.py --- a/src/htmltextview.py Fri Sep 30 10:11:08 2011 +0200 +++ b/src/htmltextview.py Fri Sep 30 13:47:15 2011 +0300 @@ -988,6 +988,12 @@ log = logging.getLogger() gaj.Interface() + # create fake gajim.plugin_manager.gui_extension_point method for tests + def gui_extension_point(*args): + pass + gajim.plugin_manager = gaj.Interface() + gajim.plugin_manager.gui_extension_point = gui_extension_point + htmlview = ConversationTextview(None) path = gtkgui_helpers.get_icon_path('gajim-muc_separator')

1 0

gajim: print warning instead of traceback when we get a commands...
by Yann Leboulanger 30 Sep '11

30 Sep '11

changeset 85c130b04f55 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=85c130b04f55 description: print warning instead of traceback when we get a commands request from an invalid JID. Fixes #6995 diffstat: src/common/commands.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diffs (26 lines): diff -r 2d7388ff5fdd -r 85c130b04f55 src/common/commands.py --- a/src/common/commands.py Fri Sep 30 10:10:36 2011 +0200 +++ b/src/common/commands.py Fri Sep 30 10:11:08 2011 +0200 @@ -27,6 +27,9 @@ import dataforms import gajim +import logging +log = logging.getLogger('gajim.c.commands') + class AdHocCommand: commandnode = 'command' commandname = 'The Command' @@ -371,7 +374,11 @@ Send disco#info result for query for command (JEP-0050, example 6.). Return True if the result was sent, False if not """ - jid = helpers.get_full_jid_from_iq(iq_obj) + try: + jid = helpers.get_full_jid_from_iq(iq_obj) + except helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % iq_obj.getFrom()) + return node = iq_obj.getTagAttr('query', 'node') if node not in self.__commands: return False

1 0

gajim: print warning when we receive a presence from an invalid JID
by Yann Leboulanger 30 Sep '11

30 Sep '11

changeset 2d7388ff5fdd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2d7388ff5fdd description: print warning when we receive a presence from an invalid JID diffstat: src/common/connection_handlers_events.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 5cde74e2a1e6 -r 2d7388ff5fdd src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Sep 28 17:43:59 2011 +0200 +++ b/src/common/connection_handlers_events.py Fri Sep 30 10:10:36 2011 +0200 @@ -710,6 +710,7 @@ try: self.get_jid_resource() except Exception: + log.warn('Invalid JID: %s, ignoring it' % self.stanza.getFrom()) return jid_list = gajim.contacts.get_jid_list(self.conn.name) self.timestamp = None

1 0

gajim: ability to remember for which JID we allow to not store l...
by Yann Leboulanger 28 Sep '11

28 Sep '11

changeset 5cde74e2a1e6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5cde74e2a1e6 description: ability to remember for which JID we allow to not store logs. Fixes #6987 diffstat: src/common/config.py | 3 ++- src/session.py | 39 ++++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 12 deletions(-) diffs (77 lines): diff -r ce086d0f1a17 -r 5cde74e2a1e6 src/common/config.py --- a/src/common/config.py Tue Sep 27 18:26:38 2011 +0300 +++ b/src/common/config.py Wed Sep 28 17:43:59 2011 +0200 @@ -333,7 +333,8 @@ 'custom_port': [ opt_int, 5222, '', True ], 'custom_host': [ opt_str, '', '', True ], 'sync_with_global_status': [ opt_bool, False, ], - 'no_log_for': [ opt_str, '' ], + 'no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')], + 'allow_no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')], 'minimized_gc': [ opt_str, '' ], 'attached_gpg_keys': [ opt_str, '' ], 'keep_alives_enabled': [ opt_bool, True, _('Whitespace sent after inactivity')], diff -r ce086d0f1a17 -r 5cde74e2a1e6 src/session.py --- a/src/session.py Tue Sep 27 18:26:38 2011 +0300 +++ b/src/session.py Wed Sep 28 17:43:59 2011 +0200 @@ -404,13 +404,11 @@ not_acceptable) self.dialog = dialogs.YesNoDialog(_('Confirm these ' - 'session options'), _('''The remote client wants ' - 'to negotiate an session with these features: - -%s - -Are these options acceptable?''') % (negotiation.describe_features( - ask_user)), + 'session options'), + _('The remote client wants to negotiate a session ' + 'with these features:\n\n%s\n\nAre these options ' + 'acceptable?''') % ( + negotiation.describe_features(ask_user)), on_response_yes=accept_nondefault_options, on_response_no=reject_nondefault_options) else: @@ -434,7 +432,18 @@ if ask_user: def accept_nondefault_options(is_checked): - dialog.destroy() + if dialog: + dialog.destroy() + + if is_checked: + allow_no_log_for = gajim.config.get_per( + 'accounts', self.conn.name, + 'allow_no_log_for').split() + jid = str(self.jid) + if jid not in allow_no_log_for: + allow_no_log_for.append(jid) + gajim.config.set_per('accounts', self.conn.name, + 'allow_no_log_for', ' '.join(allow_no_log_for)) negotiated.update(ask_user) @@ -447,10 +456,18 @@ self.reject_negotiation() dialog.destroy() - dialog = dialogs.YesNoDialog(_('Confirm these session options'), - _('The remote client selected these options:\n\n%s\n\n' - 'Continue with the session?') % ( + allow_no_log_for = gajim.config.get_per('accounts', + self.conn.name, 'allow_no_log_for').split() + if str(self.jid) in allow_no_log_for: + dialog = None + accept_nondefault_options(False) + else: + dialog = dialogs.YesNoDialog(_('Confirm these session ' + 'options'), + _('The remote client selected these options:\n\n%s' + '\n\nContinue with the session?') % ( negotiation.describe_features(ask_user)), + _('Always accept for this contact'), on_response_yes = accept_nondefault_options, on_response_no = reject_nondefault_options) else:

1 0

gajim: typo
by Fomin Denis 27 Sep '11

27 Sep '11

changeset ce086d0f1a17 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ce086d0f1a17 description: typo diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e159576e9f2e -r ce086d0f1a17 src/dialogs.py --- a/src/dialogs.py Tue Sep 27 18:17:43 2011 +0300 +++ b/src/dialogs.py Tue Sep 27 18:26:38 2011 +0300 @@ -2482,7 +2482,7 @@ return if gajim.contacts.get_contact(self.account, room_jid) and \ - not gajim.contacts.get_contact(self.account, room_jid).is_transport(): + gajim.contacts.get_contact(self.account, room_jid).is_transport(): ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return

1 0

gajim: prepare beta2
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset e9c5efbb1d40 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e9c5efbb1d40 description: prepare beta2 diffstat: autogen.sh | 2 +- src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (22 lines): diff -r c42992f93428 -r e9c5efbb1d40 autogen.sh --- a/autogen.sh Tue Sep 27 16:52:30 2011 +0200 +++ b/autogen.sh Tue Sep 27 17:14:40 2011 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-beta1" + gajimversion="0.15-beta2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r c42992f93428 -r e9c5efbb1d40 src/common/defs.py --- a/src/common/defs.py Tue Sep 27 16:52:30 2011 +0200 +++ b/src/common/defs.py Tue Sep 27 17:14:40 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15-beta1' +version = '0.15-beta2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: fix var name
by Fomin Denis 27 Sep '11

27 Sep '11

changeset 89f199c77560 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89f199c77560 description: fix var name diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1628af81d67b -r 89f199c77560 src/dialogs.py --- a/src/dialogs.py Tue Sep 27 16:13:12 2011 +0300 +++ b/src/dialogs.py Tue Sep 27 17:23:10 2011 +0300 @@ -2482,7 +2482,7 @@ return if gajim.contacts.get_contact(self.account, room_jid) and \ - not gajim.contacts.get_contact(account, room_jid).is_groupchat(): + not gajim.contacts.get_contact(self.account, room_jid).is_groupchat(): ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return

1 0

gajim: fix typo in french translation. see #6987
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset c42992f93428 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c42992f93428 description: fix typo in french translation. see #6987 diffstat: po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 89f199c77560 -r c42992f93428 po/fr.po --- a/po/fr.po Tue Sep 27 17:23:10 2011 +0300 +++ b/po/fr.po Tue Sep 27 16:52:30 2011 +0200 @@ -10332,7 +10332,7 @@ "\n" "Continue with the session?" msgstr "" -"Le client distant à choisi ces options :\n" +"Le client distant a choisi ces options :\n" "\n" "%s\n" "\n"

1 0

gajim: Fixes #6906 again
by Fomin Denis 27 Sep '11

27 Sep '11

changeset 1628af81d67b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1628af81d67b description: Fixes #6906 again diffstat: src/dialogs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 772ddd6731ee -r 1628af81d67b src/dialogs.py --- a/src/dialogs.py Mon Sep 26 21:57:30 2011 +0200 +++ b/src/dialogs.py Tue Sep 27 16:13:12 2011 +0300 @@ -2481,7 +2481,8 @@ _('The group chat Jabber ID has not allowed characters.')) return - if gajim.contacts.get_contact(self.account, room_jid): + if gajim.contacts.get_contact(self.account, room_jid) and \ + not gajim.contacts.get_contact(account, room_jid).is_groupchat(): ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return

1 0

gajim: Fix E2E decryption. Fixes #6984
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 772ddd6731ee in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=772ddd6731ee description: Fix E2E decryption. Fixes #6984 diffstat: src/common/stanza_session.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 5f6618d9cb7d -r 772ddd6731ee src/common/stanza_session.py --- a/src/common/stanza_session.py Mon Sep 26 20:47:33 2011 +0300 +++ b/src/common/stanza_session.py Mon Sep 26 21:57:30 2011 +0200 @@ -493,7 +493,10 @@ stanza.addChild(node=child) # replace non-character unicode - stranza = self.conn.connection.Dispatcher.replace_non_character(stanza) + body = stanza.getBody() + if body: + stanza.setBody( + self.conn.connection.Dispatcher.replace_non_character(body)) return stanza

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 2011