From 8dcd70edbee11259c671ef19ec51054225ff4842 Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Sun, 23 Jan 2011 15:20:43 +0100 Subject: [PATCH] St: Use clutter_actor_get_request_mode Use clutter_actor_get_request_mode rather than g_object_get since we have it in the required clutter version. https://bugzilla.gnome.org/show_bug.cgi?id=640415 --- src/st/st-private.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/st/st-private.c b/src/st/st-private.c index f4707691e..290cdf833 100644 --- a/src/st/st-private.c +++ b/src/st/st-private.c @@ -49,7 +49,7 @@ _st_actor_get_preferred_width (ClutterActor *actor, ClutterRequestMode mode; gfloat natural_height; - g_object_get (G_OBJECT (actor), "request-mode", &mode, NULL); + mode = clutter_actor_get_request_mode (actor); if (mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT) { clutter_actor_get_preferred_height (actor, -1, NULL, &natural_height); @@ -86,7 +86,7 @@ _st_actor_get_preferred_height (ClutterActor *actor, ClutterRequestMode mode; gfloat natural_width; - g_object_get (G_OBJECT (actor), "request-mode", &mode, NULL); + mode = clutter_actor_get_request_mode (actor); if (mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH) { clutter_actor_get_preferred_width (actor, -1, NULL, &natural_width); @@ -173,8 +173,7 @@ _st_allocate_fill (StWidget *parent, * modified to cope with the fact that the available size may be * less than the preferred size. */ - request = CLUTTER_REQUEST_HEIGHT_FOR_WIDTH; - g_object_get (G_OBJECT (child), "request-mode", &request, NULL); + request = clutter_actor_get_request_mode (child); if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH) {