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

make assign GPP key unsensitive when GPG is not enabled

Browse source
This commit is contained in:
Yann Leboulanger 2007-11-26 19:17:14 +00:00
parent 3ee18c20c8
commit a332543d68
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/roster_window.py
View file

@ -2076,9 +2076,11 @@ class RosterWindow:
edit_groups_menuitem.connect('activate', self.on_edit_groups, [( edit_groups_menuitem.connect('activate', self.on_edit_groups, [(
contact,account)]) contact,account)])
if gajim.config.get('usegpg'): if gajim.connections[account].gpg:
assign_openpgp_key_menuitem.connect('activate', assign_openpgp_key_menuitem.connect('activate',
self.on_assign_pgp_key, contact, account) self.on_assign_pgp_key, contact, account)
else:
assign_openpgp_key_menuitem.set_sensitive(False)
else: # contact is in group 'Not in Roster' else: # contact is in group 'Not in Roster'
edit_groups_menuitem.set_sensitive(False) edit_groups_menuitem.set_sensitive(False)
@ -2310,9 +2312,11 @@ class RosterWindow:
edit_groups_menuitem.connect('activate', self.on_edit_groups, [( edit_groups_menuitem.connect('activate', self.on_edit_groups, [(
contact,account)]) contact,account)])
if gajim.config.get('usegpg'): if gajim.connections[account].gpg:
assign_openpgp_key_menuitem.connect('activate', assign_openpgp_key_menuitem.connect('activate',
self.on_assign_pgp_key, contact, account) self.on_assign_pgp_key, contact, account)
else:
assign_openpgp_key_menuitem.set_sensitive(False)
if contact.sub in ('from', 'both'): if contact.sub in ('from', 'both'):
send_auth_menuitem.set_sensitive(False) send_auth_menuitem.set_sensitive(False)
@ -3465,7 +3469,7 @@ class RosterWindow:
passwords.save_password(account, passphrase) passwords.save_password(account, passphrase)
keyid = gajim.config.get_per('accounts', account, 'keyid') keyid = gajim.config.get_per('accounts', account, 'keyid')
if keyid and not common.connection.USE_GPG: if keyid and not gajim.connections[account].gpg:
dialog = dialogs.WarningDialog(_('GPG is not usable'), dialog = dialogs.WarningDialog(_('GPG is not usable'),
_('You will be connected to %s without OpenPGP.') % account) _('You will be connected to %s without OpenPGP.') % account)