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

Dont show encryption methods if not supported

Browse source
This commit is contained in:
Philipp Hörist 2018-05-21 18:08:46 +02:00
parent 7040ea6b2e
commit 764b275394
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gajim/chat_control.py
View file

@ -218,7 +218,8 @@ class ChatControl(ChatControlBase):
self.encryption_menu = self.xml.get_object('encryption_menu') self.encryption_menu = self.xml.get_object('encryption_menu')
self.encryption_menu.set_menu_model( self.encryption_menu.set_menu_model(
gui_menu_builder.get_encryption_menu(self.control_id, self.type_id)) gui_menu_builder.get_encryption_menu(
self.control_id, self.type_id, self.account == 'Local'))
self.set_encryption_menu_icon() self.set_encryption_menu_icon()
# restore previous conversation # restore previous conversation
self.restore_conversation() self.restore_conversation()

5
gajim/gui_menu_builder.py
View file

@ -827,7 +827,7 @@ def build_bookmark_menu(account):
menu.insert_submenu(1, label, bookmark_menu) menu.insert_submenu(1, label, bookmark_menu)
def get_encryption_menu(control_id, type_id): def get_encryption_menu(control_id, type_id, zeroconf=False):
menu = Gio.Menu() menu = Gio.Menu()
menu.append( menu.append(
'Disabled', 'win.set-encryption-{}::{}'.format(control_id, 'disabled')) 'Disabled', 'win.set-encryption-{}::{}'.format(control_id, 'disabled'))
@ -838,6 +838,9 @@ def get_encryption_menu(control_id, type_id):
if type_id == 'pm': if type_id == 'pm':
if not hasattr(plugin, 'allow_privatchat'): if not hasattr(plugin, 'allow_privatchat'):
continue continue
if zeroconf:
if not hasattr(plugin, 'allow_zeroconf'):
continue
menu_action = 'win.set-encryption-{}::{}'.format( menu_action = 'win.set-encryption-{}::{}'.format(
control_id, name) control_id, name)
menu.append(name, menu_action) menu.append(name, menu_action)