Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim
Commits:
ff89b64b by wurstsalat at 2023-03-29T10:16:13+02:00
cfix: Use new wiki page
- - - - -
078e3553 by wurstsalat at 2023-03-29T10:21:22+02:00
cfix: Fire encryption_state extension point only for plugins
- - - - -
2 changed files:
- gajim/gtk/accounts.py
- gajim/gtk/message_actions_box.py
Changes:
=====================================
gajim/gtk/accounts.py
=====================================
@@ -943,8 +943,7 @@ def __init__(self, account: str) -> None:
btbv_label = Gtk.Label()
btbv_label.set_xalign(0)
markup = '<a href="%s">%s</a>' % (
- 'https://dev.gajim.org/gajim/gajim-plugins/-/'
- 'wikis/omemogajimplugin',
+ 'https://dev.gajim.org/gajim/gajim/-/wikis/help/OMEMO',
_('Read more about blind trust'))
btbv_label.set_markup(markup)
self.add(btbv_label)
=====================================
gajim/gtk/message_actions_box.py
=====================================
@@ -336,20 +336,21 @@ def _update_encryption_button(self) -> None:
def _update_encryption_details_button(self) -> None:
contact = self.get_current_contact()
- state = contact.settings.get('encryption')
+ encryption = contact.settings.get('encryption')
- encryption_state = {'visible': bool(state),
- 'enc_type': state,
+ encryption_state = {'visible': bool(encryption),
+ 'enc_type': encryption,
'authenticated': False}
- if state:
- app.plugin_manager.extension_point(
- f'encryption_state{state}',
- app.window.get_control(),
- encryption_state)
-
- if state == 'OMEMO':
- encryption_state['authenticated'] = True
+ if encryption:
+ if encryption == 'OMEMO':
+ encryption_state['authenticated'] = True
+ else:
+ # Only fire extension_point for plugins (i.e. not OMEMO)
+ app.plugin_manager.extension_point(
+ f'encryption_state{encryption}',
+ app.window.get_control(),
+ encryption_state)
visible, enc_type, authenticated = encryption_state.values()
assert isinstance(visible, bool)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/8564473de0e3bd451f1fd4cdd8c42f8c1705b358...078e35537814a63cb8ddd5edf972a5ebb97c5cd3
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/8564473de0e3bd451f1fd4cdd8c42f8c1705b358...078e35537814a63cb8ddd5edf972a5ebb97c5cd3
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
