status message was not set in some other cases

This commit is contained in:
Dimitur Kirov 2005-08-01 18:19:36 +00:00
parent 79d2459d9f
commit 9183b73766
1 changed files with 4 additions and 4 deletions

View File

@ -997,16 +997,16 @@ class Connection:
if show == 'online':
sshow = None
signed = ''
if not msg:
lowered_uf_status_msg = helpers.get_uf_show(show).lower()
msg = _("I'm %s") % lowered_uf_status_msg
keyID = gajim.config.get_per('accounts', self.name, 'keyid')
if keyID and USE_GPG:
if self.connected < 2 and self.gpg.passphrase is None:
# We didn't set a passphrase
self.dispatch('ERROR', (_('OpenPGP Key was not given'),
_('You will be connected to %s without OpenPGP.') % self.name))
if self.connected >= 2:
if not msg:
lowered_uf_status_msg = helpers.get_uf_show(show).lower()
msg = _("I'm %s") % lowered_uf_status_msg
else:
signed = self.gpg.sign(msg, keyID)
if signed == 'BAD_PASSPHRASE':
signed = ''