From be4007ef53acce84dbb7b90be7f06eab1b845bc6 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon, 17 Oct 2011 10:25:07 +0100
Subject: [PATCH] Remove mentions of clutter_redraw()

---
 clutter/clutter-actor.c        | 14 ++++++++------
 clutter/clutter-main.c         |  2 +-
 clutter/clutter-master-clock.c |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 95b9a7b97..87aba079a 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -4832,23 +4832,25 @@ clutter_actor_class_init (ClutterActorClass *klass)
    * The default implementation for #ClutterActor chains up to the
    * parent actor and queues a redraw on the parent, thus "bubbling"
    * the redraw queue up through the actor graph. The default
-   * implementation for #ClutterStage queues a clutter_redraw() in a
-   * main loop idle handler.
+   * implementation for #ClutterStage queues a clutter_stage_ensure_redraw()
+   * in a main loop idle handler.
    *
    * Note that the @origin actor may be the stage, or a container; it
    * does not have to be a leaf node in the actor graph.
    *
    * Toolkits embedding a #ClutterStage which require a redraw and
    * relayout cycle can stop the emission of this signal using the
-   * GSignal API, redraw the UI and then call clutter_redraw()
+   * GSignal API, redraw the UI and then call clutter_stage_ensure_redraw()
    * themselves, like:
    *
    * |[
    *   static void
-   *   on_redraw_complete (void)
+   *   on_redraw_complete (gpointer data)
    *   {
+   *     ClutterStage *stage = data;
+   *
    *     /&ast; execute the Clutter drawing pipeline &ast;/
-   *     clutter_redraw ();
+   *     clutter_stage_ensure_redraw (stage);
    *   }
    *
    *   static void
@@ -4860,7 +4862,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
    *     /&ast; queue a redraw with the host toolkit and call
    *      &ast; a function when the redraw has been completed
    *      &ast;/
-   *     queue_a_redraw (G_CALLBACK (on_redraw_complete));
+   *     queue_a_redraw (G_CALLBACK (on_redraw_complete), stage);
    *   }
    * ]|
    *
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 128a30766..7d4d8159a 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -3329,7 +3329,7 @@ clutter_threads_add_repaint_func (GSourceFunc    func,
  * Executes the repaint functions added using the
  * clutter_threads_add_repaint_func() function.
  *
- * Must be called before calling clutter_redraw() and
+ * Must be called before calling _clutter_stage_do_paint() and
  * with the Clutter thread lock held.
  */
 void
diff --git a/clutter/clutter-master-clock.c b/clutter/clutter-master-clock.c
index ce8d70bc2..21a86d579 100644
--- a/clutter/clutter-master-clock.c
+++ b/clutter/clutter-master-clock.c
@@ -532,8 +532,8 @@ _clutter_master_clock_start_running (ClutterMasterClock *master_clock)
  * @master_clock: a #ClutterMasterClock
  *
  * Advances all the timelines held by the master clock. This function
- * should be called before calling clutter_redraw() to make sure that
- * all the timelines are advanced and the scene is updated.
+ * should be called before calling _clutter_stage_do_update() to
+ * make sure that all the timelines are advanced and the scene is updated.
  */
 void
 _clutter_master_clock_advance (ClutterMasterClock *master_clock)