status message was not set in some other cases
This commit is contained in:
parent
79d2459d9f
commit
9183b73766
1 changed files with 4 additions and 4 deletions
|
@ -997,16 +997,16 @@ class Connection:
|
||||||
if show == 'online':
|
if show == 'online':
|
||||||
sshow = None
|
sshow = None
|
||||||
signed = ''
|
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')
|
keyID = gajim.config.get_per('accounts', self.name, 'keyid')
|
||||||
if keyID and USE_GPG:
|
if keyID and USE_GPG:
|
||||||
if self.connected < 2 and self.gpg.passphrase is None:
|
if self.connected < 2 and self.gpg.passphrase is None:
|
||||||
# We didn't set a passphrase
|
# We didn't set a passphrase
|
||||||
self.dispatch('ERROR', (_('OpenPGP Key was not given'),
|
self.dispatch('ERROR', (_('OpenPGP Key was not given'),
|
||||||
_('You will be connected to %s without OpenPGP.') % self.name))
|
_('You will be connected to %s without OpenPGP.') % self.name))
|
||||||
if self.connected >= 2:
|
else:
|
||||||
if not msg:
|
|
||||||
lowered_uf_status_msg = helpers.get_uf_show(show).lower()
|
|
||||||
msg = _("I'm %s") % lowered_uf_status_msg
|
|
||||||
signed = self.gpg.sign(msg, keyID)
|
signed = self.gpg.sign(msg, keyID)
|
||||||
if signed == 'BAD_PASSPHRASE':
|
if signed == 'BAD_PASSPHRASE':
|
||||||
signed = ''
|
signed = ''
|
||||||
|
|
Loading…
Add table
Reference in a new issue