[network-manager-applet/lr/gtk4-part1: 1/6] nma/pkcs11-cert-chooser: show the password entries when it makes sense
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/gtk4-part1: 1/6] nma/pkcs11-cert-chooser: show the password entries when it makes sense
- Date: Fri, 15 Feb 2019 16:50:50 +0000 (UTC)
commit 4faf80be0fae23b3ab443fa71e5756265be507c5
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Feb 15 10:49:37 2019 +0100
nma/pkcs11-cert-chooser: show the password entries when it makes sense
Fixes: 0aaa37659af39381b60ea2aeeb48545909bdaf47
src/libnma/nma-pkcs11-cert-chooser.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/libnma/nma-pkcs11-cert-chooser.c b/src/libnma/nma-pkcs11-cert-chooser.c
index bcbe3059..927b13cf 100644
--- a/src/libnma/nma-pkcs11-cert-chooser.c
+++ b/src/libnma/nma-pkcs11-cert-chooser.c
@@ -65,6 +65,9 @@ set_key_uri (NMACertChooser *cert_chooser, const gchar *uri)
gtk_widget_set_sensitive (priv->key_button_label, TRUE);
gtk_widget_set_sensitive (priv->key_password, TRUE);
gtk_widget_set_sensitive (priv->key_password_label, TRUE);
+ gtk_widget_show (priv->key_password);
+ gtk_widget_show (priv->key_password_label);
+ gtk_widget_show (priv->show_password);
nma_cert_chooser_button_set_uri (NMA_CERT_CHOOSER_BUTTON (priv->key_button), uri);
}
@@ -109,6 +112,9 @@ set_cert_uri (NMACertChooser *cert_chooser, const gchar *uri)
} else if (g_str_has_prefix (uri, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) {
gtk_widget_set_sensitive (priv->cert_password, TRUE);
gtk_widget_set_sensitive (priv->cert_password_label, TRUE);
+ gtk_widget_show (priv->cert_password);
+ gtk_widget_show (priv->cert_password_label);
+ gtk_widget_show (priv->show_password);
} else {
g_warning ("The certificate '%s' uses an unknown scheme\n", uri);
return;
@@ -410,8 +416,9 @@ set_flags (NMACertChooser *cert_chooser, NMACertChooserFlags flags)
gtk_widget_hide (priv->key_button);
gtk_widget_hide (priv->key_button_label);
- /* If these are not sensitive now, the cannot possibly be made
- * sensitive and there's no point in showing them. */
+ /* With FLAG_PASSWORDS the user can't pick a different key or a
+ * certificate, to there's point in showing inactive password
+ * inputs. */
if (!gtk_widget_get_sensitive (priv->cert_password)) {
gtk_widget_hide (priv->cert_password);
gtk_widget_hide (priv->cert_password_label);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]