From 3e5525a5b7f9ea0999afc74551770cbb92ab059b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 22 Oct 2018 15:32:58 +0200
Subject: libnma/vpn-password-dialog: drop use of GtkWidget.no-show-all
 property

It's going away in Gtk4. We don't do show_all() anyway -- just hide the
widgets by default.

This commit brings back parts of 07d900c0b ("libnma: drop use of
GtkWidget.no-show-all property") that was unnecessarily reverted in
f56334c307f ("Revert "libnma: drop use of GtkWidget.no-show-all
property"") with another fix folded in.

https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/24
---
 src/libnma/nma-vpn-password-dialog.ui | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/libnma/nma-vpn-password-dialog.ui b/src/libnma/nma-vpn-password-dialog.ui
index bcbac83c..ca3009dc 100644
--- a/src/libnma/nma-vpn-password-dialog.ui
+++ b/src/libnma/nma-vpn-password-dialog.ui
@@ -86,8 +86,8 @@
             </child>
             <child>
               <object class="GtkEntry" id="password_entry_tertiary">
+                <property name="visible">False</property>
                 <property name="can_focus">True</property>
-                <property name="no_show_all">True</property>
                 <property name="visibility">False</property>
                 <property name="width_chars">20</property>
                 <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/>
@@ -99,9 +99,8 @@
             </child>
             <child>
               <object class="GtkEntry" id="password_entry_secondary">
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="can_focus">True</property>
-                <property name="no_show_all">True</property>
                 <property name="visibility">False</property>
                 <property name="width_chars">20</property>
                 <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/>
@@ -115,7 +114,6 @@
               <object class="GtkEntry" id="password_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="no_show_all">True</property>
                 <property name="visibility">False</property>
                 <property name="width_chars">20</property>
                 <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/>
@@ -127,8 +125,8 @@
             </child>
             <child>
               <object class="GtkLabel" id="password_label_tertiary">
+                <property name="visible">False</property>
                 <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">_Tertiary Password:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">password_entry_tertiary</property>
@@ -141,9 +139,8 @@
             </child>
             <child>
               <object class="GtkLabel" id="password_label_secondary">
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">_Secondary Password:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">password_entry_secondary</property>
@@ -158,7 +155,6 @@
               <object class="GtkLabel" id="password_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">_Password:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">password_entry</property>
@@ -171,8 +167,8 @@
             </child>
             <child>
               <object class="GtkLabel" id="message_label">
+                <property name="visible">False</property>
                 <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
                 <property name="halign">start</property>
                 <property name="margin_bottom">12</property>
                 <property name="hexpand">True</property>
-- 
cgit v1.2.1