From 738da72f5ae7fef0b5adb9d74e9f96908d0c4984 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 7 Mar 2007 16:52:08 +0000 Subject: [PATCH] [andreas] don't change status message when we go auto away and no autoaway status message is defined. Same thing for autoXA. fixes #2994 --- src/gajim.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gajim.py b/src/gajim.py index 4d615918f..abc518aa1 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -1675,16 +1675,20 @@ class Interface: gajim.status_before_autoaway[account] = \ gajim.connections[account].status # we go away (no auto status) [we pass True to auto param] - self.roster.send_status(account, 'away', - gajim.config.get('autoaway_message'), auto=True) + auto_message = gajim.config.get('autoaway_message') + if not auto_message: + auto_message = gajim.connections[account].status + self.roster.send_status(account, 'away', auto_message, auto=True) gajim.sleeper_state[account] = 'autoaway' elif state == common.sleepy.STATE_XA and (\ gajim.sleeper_state[account] == 'autoaway' or \ gajim.sleeper_state[account] == 'online') and \ gajim.config.get('autoxa'): # we go extended away [we pass True to auto param] - self.roster.send_status(account, 'xa', - gajim.config.get('autoxa_message'), auto=True) + auto_message = gajim.config.get('autoxa_message') + if not auto_message: + auto_message = gajim.connections[account].status + self.roster.send_status(account, 'xa', auto_message, auto=True) gajim.sleeper_state[account] = 'autoxa' return True # renew timeout (loop for ever)