[PATCH 2/2] Remove unnecessary use_markup attributes.

David Shea dshea at redhat.com
Tue Mar 4 20:24:04 UTC 2014


None of these strings actually use markup. Removing the attribute does
not affect the placeholder strings since GtkLabel.set_text and
GtkLabel.set_markup both set use_markup to the appropriate value.
---
 pyanaconda/ui/gui/spokes/lib/cart.glade       | 5 ++---
 pyanaconda/ui/gui/spokes/lib/passphrase.glade | 5 ++---
 pyanaconda/ui/gui/spokes/password.glade       | 5 ++---
 pyanaconda/ui/gui/spokes/storage.glade        | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/lib/cart.glade b/pyanaconda/ui/gui/spokes/lib/cart.glade
index f0bd3df..b33b46e 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.glade
+++ b/pyanaconda/ui/gui/spokes/lib/cart.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Thu Oct 17 10:47:48 2013 -->
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="disk_store">
     <columns>
       <!-- column-name isBootDisk -->
@@ -224,7 +224,6 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Disk summary goes here</property>
-                <property name="use_markup">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.glade b/pyanaconda/ui/gui/spokes/lib/passphrase.glade
index e8a86e1..6beecbb 100644
--- a/pyanaconda/ui/gui/spokes/lib/passphrase.glade
+++ b/pyanaconda/ui/gui/spokes/lib/passphrase.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Thu Oct 17 10:48:44 2013 -->
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires AnacondaWidgets 1.0 -->
   <object class="GtkDialog" id="passphrase_dialog">
     <property name="can_focus">False</property>
@@ -233,7 +233,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Warning: You won't be able to switch between keyboard layouts (from the default one) when you decrypt your disks after install.</property>
-                <property name="use_markup">True</property>
                 <property name="wrap">True</property>
               </object>
               <packing>
diff --git a/pyanaconda/ui/gui/spokes/password.glade b/pyanaconda/ui/gui/spokes/password.glade
index e123e83..a1c27e5 100644
--- a/pyanaconda/ui/gui/spokes/password.glade
+++ b/pyanaconda/ui/gui/spokes/password.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
+  <requires lib="gtk+" version="3.6"/>
   <!-- interface-requires AnacondaWidgets 1.0 -->
   <object class="AnacondaSpokeWindow" id="passwordWindow">
     <property name="can_focus">False</property>
@@ -51,7 +52,6 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="GUI|Password">_Root Password:</property>
-                        <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">pw</property>
                       </object>
@@ -68,7 +68,6 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="GUI|Password">_Confirm:</property>
-                        <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">confirmPW</property>
                       </object>
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade
index cc73d2a..be98911 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Fri Jan 10 15:31:55 2014 -->
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
+  <requires lib="gtk+" version="3.6"/>
   <!-- interface-requires AnacondaWidgets 1.0 -->
   <object class="GtkDialog" id="need_space_dialog">
     <property name="width_request">600</property>
@@ -859,7 +859,6 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">_Encrypt my data.</property>
-                                            <property name="use_markup">True</property>
                                             <property name="use_underline">True</property>
                                           </object>
                                         </child>
-- 
1.8.5.3



More information about the anaconda-patches mailing list