From 898f84c9c7681d7a094860292af3de10b1af8287 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 27 Mar 2007 09:38:27 +0000 Subject: [PATCH] Do not check if the ClutterStageGlx parent paint vfunc is set: we set it ourselves. --- ChangeLog | 6 ++++++ clutter/glx/clutter-stage-glx.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6861c9884..3d469e8fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-27 Emmanuele Bassi + + * clutter/glx/clutter-stage-glx.c: Remove the check in the + paint chain up: we know for sure that the parent's paint + vfunc is present. + 2007-03-27 Matthew Allum * clutter/clutter-feature.c: diff --git a/clutter/glx/clutter-stage-glx.c b/clutter/glx/clutter-stage-glx.c index ad56b84b2..d500b8b69 100644 --- a/clutter/glx/clutter-stage-glx.c +++ b/clutter/glx/clutter-stage-glx.c @@ -311,10 +311,8 @@ clutter_stage_glx_paint (ClutterActor *self) glDisable (GL_LIGHTING); glDisable (GL_DEPTH_TEST); - /* FIXME Check is redundant */ - if (G_LIKELY(CLUTTER_ACTOR_CLASS (clutter_stage_glx_parent_class)->paint)) - /* Basically call up to ClutterGroup paint here */ - CLUTTER_ACTOR_CLASS (clutter_stage_glx_parent_class)->paint (self); + /* chain up to reach ClutterGroup->paint here */ + CLUTTER_ACTOR_CLASS (clutter_stage_glx_parent_class)->paint (self); /* Why this paint is done in backend as likely GL windowing system * specific calls, like swapping buffers. @@ -442,7 +440,7 @@ clutter_stage_glx_set_cursor_visible (ClutterStage *stage, if (stage_glx->xwin == None) return; - CLUTTER_NOTE (MISC, "setting cursor state (%s) over stage window (%u)", + CLUTTER_NOTE (MISC, "setting cursor state ('%s') over stage window (%u)", show_cursor ? "visible" : "invisible", (unsigned int) stage_glx->xwin);