[gnome-control-center] gvc-level-bar: Replace size_request by get_preferred_width/height

[Bastien Nocera <hadess src gnome org>]

commit 9aa37efb15567796c1fa0c3ffb0a3957c0d0f857
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Nov 17 22:22:01 2010 +0100

    gvc-level-bar: Replace size_request by get_preferred_width/height
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=635117

 panels/sound/gvc-level-bar.c |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/panels/sound/gvc-level-bar.c b/panels/sound/gvc-level-bar.c
index 2d3d9da..519fcc8 100644
--- a/panels/sound/gvc-level-bar.c
+++ b/panels/sound/gvc-level-bar.c
@@ -438,12 +438,7 @@ static void
 gvc_level_bar_size_request (GtkWidget      *widget,
                             GtkRequisition *requisition)
 {
-        GvcLevelBar *bar;
-
-        g_return_if_fail (GVC_IS_LEVEL_BAR (widget));
-        g_return_if_fail (requisition != NULL);
-
-        bar = GVC_LEVEL_BAR (widget);
+        GvcLevelBar *bar = GVC_LEVEL_BAR (widget);
 
         switch (bar->priv->orientation) {
         case GTK_ORIENTATION_VERTICAL:
@@ -461,6 +456,30 @@ gvc_level_bar_size_request (GtkWidget      *widget,
 }
 
 static void
+gvc_level_bar_get_preferred_width (GtkWidget *widget,
+                                   gint      *minimum,
+                                   gint      *natural)
+{
+        GtkRequisition requisition;
+
+        gvc_level_bar_size_request (widget, &requisition);
+
+        *minimum = *natural = requisition.width;
+}
+
+static void
+gvc_level_bar_get_preferred_height (GtkWidget *widget,
+                                    gint      *minimum,
+                                    gint      *natural)
+{
+        GtkRequisition requisition;
+
+        gvc_level_bar_size_request (widget, &requisition);
+
+        *minimum = *natural = requisition.height;
+}
+
+static void
 gvc_level_bar_size_allocate (GtkWidget     *widget,
                              GtkAllocation *allocation)
 {
@@ -648,7 +667,8 @@ gvc_level_bar_class_init (GvcLevelBarClass *klass)
         object_class->get_property = gvc_level_bar_get_property;
 
         widget_class->draw = gvc_level_bar_draw;
-        widget_class->size_request = gvc_level_bar_size_request;
+        widget_class->get_preferred_width = gvc_level_bar_get_preferred_width;
+        widget_class->get_preferred_height = gvc_level_bar_get_preferred_height;
         widget_class->size_allocate = gvc_level_bar_size_allocate;
 
         g_object_class_install_property (object_class,