[gnome-disk-utility/gnome-3-6] Add window title to the "Change Passphrase" dialog

[David Zeuthen <davidz src gnome org>]

commit b19183bae61de70c39fa5c96a0ad9c8a54d9d6b3
Author: David Zeuthen <zeuthen gmail com>
Date:   Sat Oct 6 15:38:41 2012 -0400

    Add window title to the "Change Passphrase" dialog
    
    In GNOME 3.6 the window manager now displays window titles even if the
    dialog is transient for its parent window (In GNOME 3.0 through 3.4
    the WM displayed the window as a sheet - e.g. without the window
    title). As no name has been set for the window, the window manager now
    simply shows "gnome-disks" which is not very friendly. The fix is
    simply to give the window a meaningful title.
    
    Also remove the GtkLabel saying "Change Passphrase" since this is now
    redundant with the window title
    
    This commit is re-using existing strings.
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 data/ui/change-passphrase-dialog.ui |   25 ++-----------------------
 1 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/data/ui/change-passphrase-dialog.ui b/data/ui/change-passphrase-dialog.ui
index 8cad7e3..ad0630d 100644
--- a/data/ui/change-passphrase-dialog.ui
+++ b/data/ui/change-passphrase-dialog.ui
@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="change-passphrase-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
+    <property name="title" translatable="yes">Change Passphrase</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
@@ -23,7 +24,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -39,7 +39,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -72,22 +71,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Change Passphrase</property>
-            <attributes>
-              <attribute name="scale" value="1.2"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -145,7 +128,6 @@
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_markup" translatable="yes">Check this box to see the passphrases entered above</property>
                 <property name="tooltip_text" translatable="yes">Check this box to see the passphrases entered above</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -281,14 +263,11 @@
             <child>
               <placeholder/>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>