[clutter: 15/17] Merge branch 'deprecate-default-stage'



commit f5d011cb67f06d35721c78f3e93389da7e550ebd
Merge: bbe54aa 213e6e4
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Mon Nov 14 11:07:54 2011 +0000

    Merge branch 'deprecate-default-stage'
    
    * deprecate-default-stage:
      evdev: do not associate device with stage
      evdev: don't even process events without a default stage
      docs: Note default stage deprecation in README
      docs: Remove clutter_stage_get_default()
      stage: Deprecate the default stage
      script: Do not use clutter_stage_get_default()
      cally/actor: Do not use the default stage as a fallback
      Try to mop up the default stage mess
      performance/*: Do not use clutter_stage_get_default()
      interactive/*: Do not use clutter_stage_get_default()
      Merge with a11y
      micro-bench/*: Do not use clutter_stage_get_default()
      accessibility/*: Do not use clutter_stage_get_default()
      conform/*: Do not use clutter_stage_get_default()

 README.in                                          |    6 +
 clutter/cally/cally-actor.c                        |   14 +-
 clutter/clutter-actor.c                            |    2 +-
 clutter/clutter-backend.c                          |    5 -
 clutter/clutter-script-parser.c                    |    7 +-
 clutter/clutter-stage.c                            |  152 +++++++++++++------
 clutter/clutter-stage.h                            |    2 -
 clutter/deprecated/clutter-stage.h                 |    6 +
 clutter/evdev/clutter-device-manager-evdev.c       |   15 ++-
 .../examples/animations-looping-animator.c         |    2 +-
 .../examples/animations-looping-implicit.c         |    2 +-
 doc/cookbook/examples/animations-looping-state.c   |    2 +-
 doc/cookbook/examples/animations-moving-animator.c |    2 +-
 doc/cookbook/examples/animations-moving-implicit.c |    2 +-
 doc/cookbook/examples/animations-moving-state.c    |    2 +-
 doc/cookbook/examples/animations-rotating.c        |    2 +-
 doc/cookbook/examples/animations-scaling-zoom.c    |    2 +-
 doc/cookbook/examples/animations-scaling.c         |    2 +-
 doc/cookbook/examples/events-buttons-click.c       |    2 +-
 doc/cookbook/examples/events-buttons-lasso.c       |    2 +-
 doc/cookbook/examples/events-buttons.c             |    2 +-
 doc/cookbook/examples/events-mouse-scroll.c        |    3 +-
 .../examples/events-pointer-motion-crossing.c      |    2 +-
 .../examples/events-pointer-motion-scribbler.c     |    3 +-
 .../examples/events-pointer-motion-stacked.c       |    3 +-
 doc/cookbook/examples/events-pointer-motion.c      |    3 +-
 .../examples/layouts-bind-constraint-allocation.c  |    2 +-
 doc/cookbook/examples/layouts-box-menu.c           |    2 +-
 .../examples/layouts-box-property-effects.c        |    2 +-
 doc/cookbook/examples/layouts-box.c                |    2 +-
 .../examples/layouts-stacking-diff-sized-actors.c  |    3 +-
 doc/cookbook/examples/layouts-stacking.c           |    3 +-
 doc/cookbook/examples/textures-crossfade-cogl.c    |    2 +-
 .../examples/textures-crossfade-slideshow.c        |    2 +-
 doc/cookbook/examples/textures-crossfade.c         |    2 +-
 doc/cookbook/examples/textures-split-go.c          |    3 +-
 doc/cookbook/examples/textures-sub-texture.c       |    3 +-
 .../clutter/clutter-animation-tutorial.xml         |    3 +-
 tests/accessibility/cally-atkcomponent-example.c   |    5 +-
 .../accessibility/cally-atkeditabletext-example.c  |   23 ++--
 tests/accessibility/cally-atkevents-example.c      |   18 ++-
 tests/accessibility/cally-atktext-example.c        |    7 +-
 tests/accessibility/cally-clone-example.c          |    7 +-
 tests/conform/test-actor-invariants.c              |   44 ++++--
 tests/conform/test-anchors.c                       |    4 +-
 tests/conform/test-cally-text.c                    |    8 +-
 tests/conform/test-clutter-cairo-texture.c         |    4 +-
 tests/conform/test-clutter-texture.c               |    4 +-
 tests/conform/test-cogl-backface-culling.c         |    5 +-
 tests/conform/test-cogl-blend-strings.c            |    5 +-
 tests/conform/test-cogl-depth-test.c               |    5 +-
 tests/conform/test-cogl-just-vertex-shader.c       |    7 +-
 tests/conform/test-cogl-materials.c                |    5 +-
 tests/conform/test-cogl-multitexture.c             |    4 +-
 tests/conform/test-cogl-npot-texture.c             |   20 ++-
 tests/conform/test-cogl-offscreen.c                |    8 +-
 tests/conform/test-cogl-path.c                     |    5 +-
 tests/conform/test-cogl-pipeline-user-matrix.c     |    4 +-
 tests/conform/test-cogl-pixel-buffer.c             |    8 +-
 tests/conform/test-cogl-premult.c                  |    5 +-
 tests/conform/test-cogl-primitive.c                |    5 +-
 tests/conform/test-cogl-readpixels.c               |    8 +-
 tests/conform/test-cogl-sub-texture.c              |    8 +-
 tests/conform/test-cogl-texture-3d.c               |    6 +-
 tests/conform/test-cogl-texture-get-set-data.c     |    4 +-
 tests/conform/test-cogl-texture-mipmaps.c          |    5 +-
 tests/conform/test-cogl-texture-pixmap-x11.c       |   52 ++++----
 tests/conform/test-cogl-texture-rectangle.c        |    4 +-
 tests/conform/test-cogl-vertex-buffer-contiguous.c |    5 +-
 tests/conform/test-cogl-vertex-buffer-interleved.c |    5 +-
 tests/conform/test-cogl-vertex-buffer-mutability.c |    5 +-
 tests/conform/test-cogl-viewport.c                 |    8 +-
 tests/conform/test-cogl-wrap-modes.c               |    4 +-
 tests/conform/test-conform-main.c                  |    1 +
 tests/conform/test-offscreen-redirect.c            |    4 +-
 tests/conform/test-paint-opacity.c                 |   14 +-
 tests/conform/test-pick.c                          |    5 +-
 tests/conform/test-score.c                         |    6 +-
 tests/conform/test-shader-effect.c                 |    4 +-
 tests/conform/test-text-cache.c                    |    4 +-
 tests/conform/test-texture-fbo.c                   |   20 +--
 tests/conform/test-timeline.c                      |    5 +-
 tests/interactive/test-actor-clone.c               |   34 ++++--
 tests/interactive/test-animation.c                 |    7 +-
 tests/interactive/test-animator.c                  |   11 +-
 tests/interactive/test-bin-layout.c                |   11 ++-
 tests/interactive/test-binding-pool.c              |    9 +-
 tests/interactive/test-box-layout.c                |    9 +-
 tests/interactive/test-cairo-flowers.c             |   46 ++++--
 tests/interactive/test-clip.c                      |   10 ++-
 tests/interactive/test-cogl-multitexture.c         |   17 ++-
 tests/interactive/test-cogl-offscreen.c            |   67 ++++++----
 tests/interactive/test-cogl-point-sprites.c        |   14 ++-
 tests/interactive/test-cogl-primitives.c           |   11 ++-
 tests/interactive/test-cogl-tex-convert.c          |   13 ++-
 tests/interactive/test-cogl-tex-foreign.c          |   13 ++-
 tests/interactive/test-cogl-tex-getset.c           |   13 ++-
 tests/interactive/test-cogl-tex-polygon.c          |   11 ++-
 tests/interactive/test-cogl-tex-tile.c             |   11 ++-
 tests/interactive/test-cogl-vertex-buffer.c        |   38 ++++--
 tests/interactive/test-events.c                    |   61 ++++----
 tests/interactive/test-fbo.c                       |   10 ++-
 tests/interactive/test-flow-layout.c               |    9 +-
 tests/interactive/test-fullscreen.c                |   20 ++-
 tests/interactive/test-grab.c                      |   14 ++-
 tests/interactive/test-layout.c                    |   10 ++-
 tests/interactive/test-main.c                      |   10 ++-
 tests/interactive/test-multistage.c                |    6 +-
 tests/interactive/test-paint-wrapper.c             |   27 +++-
 tests/interactive/test-pixmap.c                    |   10 ++-
 tests/interactive/test-scale.c                     |   11 ++-
 tests/interactive/test-stage-read-pixels.c         |   10 ++-
 tests/interactive/test-stage-sizing.c              |   10 ++-
 tests/interactive/test-state-animator.c            |   15 ++-
 tests/interactive/test-state.c                     |   23 ++-
 tests/interactive/test-swipe-action.c              |   11 ++-
 tests/interactive/test-table-layout.c              |    5 +-
 tests/interactive/test-text.c                      |   20 ++-
 tests/interactive/test-texture-quality.c           |   14 ++-
 tests/interactive/test-texture-slicing.c           |    9 +-
 tests/interactive/test-unproject.c                 |   14 ++-
 tests/micro-bench/test-cogl-perf.c                 |   14 +-
 tests/micro-bench/test-picking.c                   |   10 +-
 tests/micro-bench/test-random-text.c               |    5 +-
 tests/micro-bench/test-text-perf.c                 |    6 +-
 tests/micro-bench/test-text.c                      |   11 +-
 tests/performance/test-picking.c                   |    9 +-
 tests/performance/test-state-hidden.c              |    7 +-
 tests/performance/test-state-interactive.c         |    6 +-
 tests/performance/test-state-mini.c                |    7 +-
 tests/performance/test-state-pick.c                |    7 +-
 tests/performance/test-state.c                     |    7 +-
 tests/performance/test-text-perf.c                 |    4 +-
 133 files changed, 921 insertions(+), 499 deletions(-)
---



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