changeset bd08d235e815 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=bd08d235e815 description: keep in config file room.JID.muc_restore_*. Fixes #7276

diffstat:

src/common/config.py | 2 ++ src/common/connection.py | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 9dd95b98e3fe -r bd08d235e815 src/common/config.py --- a/src/common/config.py Wed Dec 12 22:03:13 2012 +0100 +++ b/src/common/config.py Thu Dec 13 10:07:51 2012 +0100 @@ -477,6 +477,8 @@ }, {}), 'rooms': ({ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], + 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], + 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit, -2 means global value')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], diff -r 9dd95b98e3fe -r bd08d235e815 src/common/connection.py --- a/src/common/connection.py Wed Dec 12 22:03:13 2012 +0100 +++ b/src/common/connection.py Thu Dec 13 10:07:51 2012 +0100 @@ -2380,10 +2380,9 @@ tags = {} timeout = gajim.config.get_per('room', room_jid, 'muc_restore_timeout') - if timeout is None: - timeout = gajim.config.get('muc_restore_timeout') * 60 - else: - timeout *= 60 + if timeout is None or timeout == -2: + timeout = gajim.config.get('muc_restore_timeout') + timeout *= 60 if timeout >= 0: last_date = self.last_history_time[room_jid] if last_date == 0: @@ -2394,7 +2393,7 @@ last_date)) tags['since'] = last_date nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') - if nb is None: + if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb