Skip to content
Snippets Groups Projects
Commit 64e7e766 authored by Philipp Hörist's avatar Philipp Hörist
Browse files

Remove dead client-cert-passphrase event handling

nbxmpp does not support client certificates anymore
parent aa2f660e
No related branches found
No related tags found
No related merge requests found
......@@ -62,53 +62,28 @@ def _process_event(self) -> None:
account_name = app.settings.get_account_setting(
self.account, 'name')
if self._event.name == 'password-required':
self._ui.header.set_text(_('Password Required'))
self._ui.message_label.set_text(
_('Please enter your password for\n'
'%(jid)s\n(Account: %(account)s)') % {
'jid': own_jid,
'account': account_name})
self._ui.save_pass_checkbutton.show()
self._ui.save_pass_checkbutton.set_sensitive(
not app.settings.get('use_keyring') or KEYRING_AVAILABLE)
if not KEYRING_AVAILABLE:
self._ui.keyring_hint.show()
if self._event.name == 'client-cert-passphrase':
self._ui.header.set_text(_('Certificate Password Required'))
self._ui.message_label.set_text(
_('Please enter your certificate password for '
'%(jid)s (%(account)s)') % {
'jid': own_jid,
'account': account_name})
self._ui.header.set_text(_('Password Required'))
self._ui.message_label.set_text(
_('Please enter your password for\n'
'%(jid)s\n(Account: %(account)s)') % {
'jid': own_jid,
'account': account_name})
self._ui.save_pass_checkbutton.show()
self._ui.save_pass_checkbutton.set_sensitive(
not app.settings.get('use_keyring') or KEYRING_AVAILABLE)
if not KEYRING_AVAILABLE:
self._ui.keyring_hint.show()
def _on_ok(self, _button: Gtk.Button) -> None:
password = self._ui.pass_entry.get_text()
if self._event.name == 'password-required':
app.settings.set_account_setting(
self.account,
'savepass',
self._ui.save_pass_checkbutton.get_active())
save_password(self.account, password)
self._event.on_password(password)
self.destroy()
if self._event.name == 'client-cert-passphrase':
self._event.conn.on_client_cert_passphrase(
password,
self._event.con,
self._event.port,
self._event.secure_tuple)
self.destroy()
app.settings.set_account_setting(
self.account,
'savepass',
self._ui.save_pass_checkbutton.get_active())
save_password(self.account, password)
self._event.on_password(password)
self.destroy()
def _on_cancel(self, _button: Gtk.Button) -> None:
if self._event.name == 'client-cert-passphrase':
self._event.conn.on_client_cert_passphrase(
'',
self._event.con,
self._event.port,
self._event.secure_tuple)
self.destroy()
......@@ -90,7 +90,6 @@
from gajim.gui.util import get_app_window
from gajim.gui.util import get_app_windows
from gajim.gui.util import get_color_for_account
from gajim.gui.util import open_window
from gajim.gui.types import ControlT
log = logging.getLogger('gajim.interface')
......@@ -144,7 +143,6 @@ def _create_core_handlers_list(self) -> None:
self.handlers = {
'iq-error-received': [self.handle_event_iq_error],
'http-auth-received': [self.handle_event_http_auth],
'client-cert-passphrase': [self.handle_event_client_cert_passphrase],
'signed-in': [self.handle_event_signed_in],
'presence-received': [self.handle_event_presence],
'our-show': [self.handle_event_status],
......@@ -209,10 +207,6 @@ def _response(answer: str) -> None:
callback=_response,
args=['yes'])]).show()
@staticmethod
def handle_event_client_cert_passphrase(event):
open_window('PasswordDialog', event=event)
@staticmethod
def handle_event_signed_in(event):
"""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment