Author: js
Date: 2008-07-28 18:36:17 +0200 (Mon, 28 Jul 2008)
New Revision: 10048
Modified:
trunk/src/common/config.py
trunk/src/gajim.py
Log:
Some users don't want their status to be restored. Make it an option.
Modified: trunk/src/common/config.py
===================================================================
--- trunk/src/common/config.py 2008-07-28 15:38:14 UTC (rev 10047)
+++ trunk/src/common/config.py 2008-07-28 16:36:17 UTC (rev 10048)
@@ -274,6 +274,7 @@
'autopriority_dnd': [ opt_int, 20],
'autopriority_invisible': [ opt_int, 10],
'autoconnect': [ opt_bool, False, '', True ],
+ 'dont_restore_last_status': [ opt_bool, False, _('If enabled, don\'t restore the last status that was used.') ],
'autoreconnect': [ opt_bool, True ],
'active': [ opt_bool, True],
'proxy': [ opt_str, '', '', True ],
Modified: trunk/src/gajim.py
===================================================================
--- trunk/src/gajim.py 2008-07-28 15:38:14 UTC (rev 10047)
+++ trunk/src/gajim.py 2008-07-28 16:36:17 UTC (rev 10048)
@@ -2777,12 +2777,16 @@
# dict of account that want to connect sorted by status
for a in gajim.connections:
if gajim.config.get_per('accounts', a, 'autoconnect'):
- self.roster.send_status(a,
- gajim.config.get_per('accounts', a,
- 'last_status'),
- helpers.from_one_line(
- gajim.config.get_per('accounts', a,
- 'last_status_msg')))
+ if not gajim.config.get_per('accounts', a,
+ 'dont_restore_last_status'):
+ self.roster.send_status(a,
+ gajim.config.get_per('accounts',
+ a, 'last_status'),
+ helpers.from_one_line(
+ gajim.config.get_per('accounts',
+ a, 'last_status_msg')))
+ else:
+ self.roster.send_status(a, 'online', '')
return False
def show_systray(self):