[gnome-control-center] privacy: Fix list sizing issues

[Bastien Nocera <hadess src gnome org>]

commit ace5a5e8bc4e906ce20415d85b928576a5ca763d
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Dec 4 23:56:26 2012 -0500

    privacy: Fix list sizing issues
    
    Make the list not expand all the way to the bottom.
    
    Revert when https://bugzilla.gnome.org/show_bug.cgi?id=689714
    is committed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689607

 panels/privacy/cc-privacy-panel.c |   10 ++++++----
 panels/privacy/privacy.ui         |    7 +++----
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
index 8dd5d13..8b092c7 100644
--- a/panels/privacy/cc-privacy-panel.c
+++ b/panels/privacy/cc-privacy-panel.c
@@ -172,23 +172,25 @@ add_row (CcPrivacyPanel *self,
 {
   GtkWidget *box, *w;
 
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
   g_object_set_data (G_OBJECT (box), "dialog-id", (gpointer)dialog_id);
   gtk_widget_set_hexpand (box, TRUE);
   gtk_container_add (GTK_CONTAINER (self->priv->list_box), box);
 
   w = gtk_label_new (label);
+  gtk_misc_set_alignment (GTK_MISC (w), 0.0f, 0.5f);
   gtk_widget_set_margin_left (w, 12);
   gtk_widget_set_margin_right (w, 12);
   gtk_widget_set_margin_top (w, 6);
   gtk_widget_set_margin_bottom (w, 6);
   gtk_widget_set_halign (w, GTK_ALIGN_START);
   gtk_widget_set_valign (w, GTK_ALIGN_CENTER);
-  gtk_container_add (GTK_CONTAINER (box), w);
+  gtk_widget_set_hexpand (w, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
   gtk_widget_set_margin_left (status, 12);
   gtk_widget_set_margin_right (status, 12);
-  gtk_widget_set_halign (w, GTK_ALIGN_END);
-  gtk_widget_set_valign (w, GTK_ALIGN_CENTER);
+  gtk_widget_set_halign (status, GTK_ALIGN_END);
+  gtk_widget_set_valign (status, GTK_ALIGN_CENTER);
   gtk_box_pack_end (GTK_BOX (box), status, FALSE, FALSE, 0);
 
   gtk_widget_show_all (box);
diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
index 0fc301c..adf4e1a 100644
--- a/panels/privacy/privacy.ui
+++ b/panels/privacy/privacy.ui
@@ -852,15 +852,14 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolled_window">
-            <property name="width_request">400</property>
-            <property name="height_request">350</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="vexpand">True</property>
             <property name="shadow_type">in</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">never</property>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">0</property>
           </packing>