[gnome-control-center] privacy: Fix alignment issues in the screen lock dialog

[Bastien Nocera <hadess src gnome org>]

commit f935ed780a05f25268ff5f47862106d20fdb6579
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Dec 5 00:05:36 2012 -0500

    privacy: Fix alignment issues in the screen lock dialog
    
    Pointed out in review.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689607

 panels/privacy/privacy.ui |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
index 8f006cc..8168e62 100644
--- a/panels/privacy/privacy.ui
+++ b/panels/privacy/privacy.ui
@@ -466,7 +466,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="screen_lock_done">
-                <property name="label" translatable="yes">_Done</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -494,7 +494,7 @@
             <property name="can_focus">False</property>
             <property name="margin_left">12</property>
             <property name="margin_right">12</property>
-            <property name="margin_top">12</property>
+            <property name="margin_top">6</property>
             <property name="margin_bottom">12</property>
             <property name="label" translatable="yes">The Screen Lock protects your privacy when you are away.</property>
           </object>
@@ -509,10 +509,9 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">12</property>
-            <property name="margin_right">12</property>
-            <property name="margin_top">12</property>
+            <property name="margin_right">2</property>
+            <property name="margin_top">6</property>
             <property name="margin_bottom">12</property>
-            <property name="border_width">6</property>
             <property name="row_spacing">12</property>
             <property name="column_spacing">6</property>
             <child>
@@ -520,6 +519,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
+                <property name="hexpand">True</property>
                 <property name="label" translatable="yes">Automatic Screen _Lock</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">automatic_screen_lock</property>
@@ -538,7 +538,7 @@
               <object class="GtkSwitch" id="automatic_screen_lock">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="halign">start</property>
+                <property name="halign">end</property>
                 <property name="valign">center</property>
               </object>
               <packing>
@@ -553,6 +553,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
+                <property name="hexpand">True</property>
                 <property name="label" translatable="yes">Lock Screen _After</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">lock_after_combo</property>
@@ -568,8 +569,10 @@
               <object class="GtkComboBoxText" id="lock_after_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
+                <property name="halign">end</property>
                 <property name="valign">center</property>
+                <property name="margin-left">4</property>
+                <property name="margin-right">4</property>
                 <property name="model">lock_after_model</property>
               </object>
               <packing>
@@ -584,6 +587,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
+                <property name="hexpand">True</property>
                 <property name="label" translatable="yes">Show _Notifications</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">show_notifications</property>
@@ -599,7 +603,7 @@
               <object class="GtkSwitch" id="show_notifications">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="halign">start</property>
+                <property name="halign">end</property>
                 <property name="valign">center</property>
               </object>
               <packing>