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

[David Zeuthen <davidz src gnome org>]

commit 30f0f7626a4f0ac204da04491826f65d5928f09b
Author: David Zeuthen <zeuthen gmail com>
Date:   Sat Oct 6 15:32:45 2012 -0400

    Add window title to the "Unlock LUKS" 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 "Enter passphrase to unlock" since
    this is now redundant with the window title
    
    This commit does is re-using existing strings.
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 data/ui/unlock-device-dialog.ui |   26 ++------------------------
 1 files changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/data/ui/unlock-device-dialog.ui b/data/ui/unlock-device-dialog.ui
index acf5463..937ca14 100644
--- a/data/ui/unlock-device-dialog.ui
+++ b/data/ui/unlock-device-dialog.ui
@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="unlock-device-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
+    <property name="title" translatable="yes">Enter passphrase to unlock</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
@@ -29,23 +30,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Enter passphrase to unlock</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="1.2"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -90,11 +74,9 @@
             <child>
               <object class="GtkCheckButton" id="unlock-device-show-passphrase-check-button">
                 <property name="label" translatable="yes">Sho_w passphrase</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</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>
@@ -113,7 +95,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
@@ -123,11 +105,9 @@
             <child>
               <object class="GtkButton" id="button5">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <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>
@@ -139,12 +119,10 @@
             <child>
               <object class="GtkButton" id="button6">
                 <property name="label" translatable="yes">_Unlock</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <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>