shell: handle GtkSizeRequest removal

This commit is contained in:
Bastien Nocera 2010-10-06 10:37:08 +01:00
parent 6dfc24e3e6
commit cdffa4f46b

View file

@ -126,7 +126,7 @@ activate_panel (GnomeControlCenter *shell,
GtkWidget *panel; GtkWidget *panel;
GtkWidget *box; GtkWidget *box;
gint i, old_page; gint i, old_page;
GtkRequisition min, nat; int nat_height;
/* create the panel plugin */ /* create the panel plugin */
panel = g_object_new (panel_type, "shell", shell, NULL); 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 */ /* resize to the preferred size of the panel */
gtk_widget_set_size_request (priv->window, FIXED_WIDTH, -1); gtk_widget_set_size_request (priv->window, FIXED_WIDTH, -1);
gtk_widget_get_preferred_height (GTK_WIDGET (priv->window),
gtk_widget_get_preferred_size (priv->window, NULL, &nat_height);
&min, &nat);
gtk_window_resize (GTK_WINDOW (priv->window), FIXED_WIDTH, gtk_window_resize (GTK_WINDOW (priv->window), FIXED_WIDTH,
nat.height); nat_height);
return; return;
} }
} }