Commits October 2011

commits@gajim.org

3 participants
64 discussions

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

02 Oct '11

changeset 3e4932e1d12f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e4932e1d12f 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 88e755fb265b -r 3e4932e1d12f 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 02 Oct '11

02 Oct '11

changeset 88e755fb265b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=88e755fb265b 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 47695039117a -r 88e755fb265b 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 @@ -721,6 +721,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 02 Oct '11

02 Oct '11

changeset 47695039117a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=47695039117a 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 e9c5efbb1d40 -r 47695039117a src/common/config.py --- a/src/common/config.py Tue Sep 27 17:14:40 2011 +0200 +++ 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 e9c5efbb1d40 -r 47695039117a src/session.py --- a/src/session.py Tue Sep 27 17:14:40 2011 +0200 +++ b/src/session.py Wed Sep 28 17:43:59 2011 +0200 @@ -406,13 +406,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: @@ -436,7 +434,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) @@ -449,10 +458,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: go back with is_groupchat() to detect groupchats. see #6906
by Yann Leboulanger 02 Oct '11

02 Oct '11

changeset 1cc46e8181b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1cc46e8181b2 description: go back with is_groupchat() to detect groupchats. see #6906 diffstat: src/dialogs.py | 2 +- src/gui_interface.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r fa253547651b -r 1cc46e8181b2 src/dialogs.py --- a/src/dialogs.py Fri Sep 30 13:47:15 2011 +0300 +++ b/src/dialogs.py Sun Oct 02 21:29:23 2011 +0200 @@ -2482,7 +2482,7 @@ return if gajim.contacts.get_contact(self.account, room_jid) and \ - gajim.contacts.get_contact(self.account, room_jid).is_transport(): + 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 diff -r fa253547651b -r 1cc46e8181b2 src/gui_interface.py --- a/src/gui_interface.py Fri Sep 30 13:47:15 2011 +0300 +++ b/src/gui_interface.py Sun Oct 02 21:29:23 2011 +0200 @@ -1903,7 +1903,7 @@ """ if gajim.contacts.get_contact(account, room_jid) and \ - gajim.contacts.get_contact(account, room_jid).is_transport(): + gajim.contacts.get_contact(account, room_jid).is_groupchat(): dialogs.ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2011