From 36f286f8082e821a4c4e8797115c0bbc31b39a77 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 27 Jul 2008 21:35:02 +0000 Subject: [PATCH] enable esession and gpg menuitems if they're active --- src/chat_control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 6545602ba..5cb97d3d2 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1964,7 +1964,7 @@ class ChatControl(ChatControlBase): gajim.jid_is_transport(jid): toggle_gpg_menuitem.set_sensitive(False) else: - toggle_gpg_menuitem.set_sensitive(not e2e_is_active) + toggle_gpg_menuitem.set_sensitive(self.gpg_is_active or not e2e_is_active) toggle_gpg_menuitem.set_active(self.gpg_is_active) # disable esessions if we or the other client don't support them @@ -1975,7 +1975,7 @@ class ChatControl(ChatControlBase): toggle_e2e_menuitem.set_sensitive(False) else: toggle_e2e_menuitem.set_active(e2e_is_active) - toggle_e2e_menuitem.set_sensitive(not self.gpg_is_active) + toggle_e2e_menuitem.set_sensitive(e2e_is_active or not self.gpg_is_active) # add_to_roster_menuitem if not hide_buttonbar_entries and _('Not in Roster') in contact.groups: