Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mesonium
gajim
Commits
64e7e766
Commit
64e7e766
authored
3 years ago
by
Philipp Hörist
Browse files
Options
Downloads
Patches
Plain Diff
Remove dead client-cert-passphrase event handling
nbxmpp does not support client certificates anymore
parent
aa2f660e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gajim/gtk/password_dialog.py
+18
-43
18 additions, 43 deletions
gajim/gtk/password_dialog.py
gajim/gui_interface.py
+0
-6
0 additions, 6 deletions
gajim/gui_interface.py
with
18 additions
and
49 deletions
gajim/gtk/password_dialog.py
+
18
−
43
View file @
64e7e766
...
...
@@ -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
()
This diff is collapsed.
Click to expand it.
gajim/gui_interface.py
+
0
−
6
View file @
64e7e766
...
...
@@ -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
):
"""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment