From cdffa4f46b52b53fe04b960f2ab3d034e8be82d4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 6 Oct 2010 10:37:08 +0100 Subject: [PATCH] shell: handle GtkSizeRequest removal --- shell/gnome-control-center.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c index e9d598abf..5f4d3e3f0 100644 --- a/shell/gnome-control-center.c +++ b/shell/gnome-control-center.c @@ -126,7 +126,7 @@ activate_panel (GnomeControlCenter *shell, GtkWidget *panel; GtkWidget *box; gint i, old_page; - GtkRequisition min, nat; + int nat_height; /* create the panel plugin */ panel = g_object_new (panel_type, "shell", shell, NULL); @@ -162,11 +162,10 @@ activate_panel (GnomeControlCenter *shell, /* resize to the preferred size of the panel */ gtk_widget_set_size_request (priv->window, FIXED_WIDTH, -1); - - gtk_widget_get_preferred_size (priv->window, - &min, &nat); + gtk_widget_get_preferred_height (GTK_WIDGET (priv->window), + NULL, &nat_height); gtk_window_resize (GTK_WINDOW (priv->window), FIXED_WIDTH, - nat.height); + nat_height); return; } }