[PATCH 3/3] Fix issues reported by the check_pw_visibility test

Vratislav Podzimek vpodzime at redhat.com
Fri Nov 29 11:06:43 UTC 2013


Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 2 +-
 pyanaconda/ui/gui/spokes/lib/passphrase.glade   | 2 +-
 pyanaconda/ui/gui/spokes/lib/passphrase.py      | 2 +-
 pyanaconda/ui/gui/spokes/password.glade         | 2 +-
 pyanaconda/ui/gui/spokes/password.py            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
index 0cff9e5..ee5883d 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
@@ -926,6 +926,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
+                                    <property name="visibility">False</property>
                                     <property name="invisible_char">●</property>
                                     <signal name="changed" handler="on_login_field_changed" swapped="no"/>
                                   </object>
@@ -941,7 +942,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="hexpand">True</property>
-                                    <property name="visibility">False</property>
                                     <property name="invisible_char">●</property>
                                     <signal name="changed" handler="on_login_field_changed" swapped="no"/>
                                   </object>
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.glade b/pyanaconda/ui/gui/spokes/lib/passphrase.glade
index 1ded87b..4861d8d 100644
--- a/pyanaconda/ui/gui/spokes/lib/passphrase.glade
+++ b/pyanaconda/ui/gui/spokes/lib/passphrase.glade
@@ -144,7 +144,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="confirm_entry">
+              <object class="GtkEntry" id="confirm_pw_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="visibility">False</property>
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py
index 0fcefd9..c3cc119 100644
--- a/pyanaconda/ui/gui/spokes/lib/passphrase.py
+++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py
@@ -40,7 +40,7 @@ class PassphraseDialog(GUIObject):
     def __init__(self, data):
         GUIObject.__init__(self, data)
 
-        self._confirm_entry = self.builder.get_object("confirm_entry")
+        self._confirm_entry = self.builder.get_object("confirm_pw_entry")
         self._passphrase_entry = self.builder.get_object("passphrase_entry")
 
         self._save_button = self.builder.get_object("passphrase_save_button")
diff --git a/pyanaconda/ui/gui/spokes/password.glade b/pyanaconda/ui/gui/spokes/password.glade
index 6f428fd..a508e1c 100644
--- a/pyanaconda/ui/gui/spokes/password.glade
+++ b/pyanaconda/ui/gui/spokes/password.glade
@@ -97,7 +97,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkEntry" id="confirm">
+                      <object class="GtkEntry" id="confirmPW">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="visibility">False</property>
diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py
index fa5ef85..b66e2d5 100644
--- a/pyanaconda/ui/gui/spokes/password.py
+++ b/pyanaconda/ui/gui/spokes/password.py
@@ -53,7 +53,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
         NormalSpoke.initialize(self)
         # place holders for the text boxes
         self.pw = self.builder.get_object("pw")
-        self.confirm = self.builder.get_object("confirm")
+        self.confirm = self.builder.get_object("confirmPW")
 
         # Install the password checks:
         # - Has a password been specified?
-- 
1.8.4.2



More information about the anaconda-patches mailing list