[gnome-shell] Replace deprecated gtk_widget_size_request



commit 167ca75388743e5cdfcf114697ed73c77b5f9a5b
Author: Rico Tzschichholz <ricotz t-online de>
Date:   Fri Nov 11 09:50:18 2011 +0100

    Replace deprecated gtk_widget_size_request

 src/shell-gtk-embed.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/shell-gtk-embed.c b/src/shell-gtk-embed.c
index f1caa93..fded8ed 100644
--- a/src/shell-gtk-embed.c
+++ b/src/shell-gtk-embed.c
@@ -136,10 +136,11 @@ shell_gtk_embed_get_preferred_width (ClutterActor *actor,
   if (embed->priv->window
       && gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
     {
-      GtkRequisition requisition;
-      gtk_widget_size_request (GTK_WIDGET (embed->priv->window), &requisition);
+      GtkRequisition min_req, natural_req;
+      gtk_widget_get_preferred_size (GTK_WIDGET (embed->priv->window), &min_req, &natural_req);
 
-      *min_width_p = *natural_width_p = requisition.width;
+      *min_width_p = min_req.width;
+      *natural_width_p = natural_req.width;
     }
   else
     *min_width_p = *natural_width_p = 0;
@@ -156,10 +157,11 @@ shell_gtk_embed_get_preferred_height (ClutterActor *actor,
   if (embed->priv->window
       && gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
     {
-      GtkRequisition requisition;
-      gtk_widget_size_request (GTK_WIDGET (embed->priv->window), &requisition);
+      GtkRequisition min_req, natural_req;
+      gtk_widget_get_preferred_size (GTK_WIDGET (embed->priv->window), &min_req, &natural_req);
 
-      *min_height_p = *natural_height_p = requisition.height;
+      *min_height_p = min_req.height;
+      *natural_height_p = natural_req.height;
     }
   else
     *min_height_p = *natural_height_p = 0;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]