copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

we now handle when the user doesn't give his OpenPGP passphrase and print an error message

Browse source
This commit is contained in:
Yann Leboulanger 2005-06-18 16:57:57 +00:00
parent 0bc0b5f783
commit 7538333c5d
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/connection.py
View file

@ -724,6 +724,10 @@ class Connection:
signed = '' signed = ''
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 == 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))
else:
if not msg: if not msg:
lowered_uf_status_msg = helpers.get_uf_show(show).lower() lowered_uf_status_msg = helpers.get_uf_show(show).lower()
msg = _("I'm %s") % lowered_uf_status_msg msg = _("I'm %s") % lowered_uf_status_msg

2
src/roster_window.py
View file

@ -907,7 +907,7 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
_('Save passphrase')) _('Save passphrase'))
passphrase, save = w.run() passphrase, save = w.run()
if passphrase == -1: if passphrase == -1:
passphrase = '' passphrase = None
else: else:
self.gpg_passphrase[keyid] = passphrase self.gpg_passphrase[keyid] = passphrase
gobject.timeout_add(30000, self.forget_gpg_passphrase, keyid) gobject.timeout_add(30000, self.forget_gpg_passphrase, keyid)