window: Handle broken icon themes more gracefully

We assert that the icons used as default window icons are loaded correctly, but currently this can fail simply because of an incomplete icon theme. After all, "image-missing" was only added to the icon-naming spec in 2005 🙄 Handle this case more gracefully by falling back to a completely transparent "icon". https://bugzilla.gnome.org/show_bug.cgi?id=720583 https://gitlab.gnome.org/GNOME/mutter/merge_requests/462
2019-02-27 22:46:19 +01:00
382 changed files with 20838 additions and 10580 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/mutter/master:v2
+image: registry.gitlab.gnome.org/gnome/mutter/master:v1

 stages:
 - review
@@ -7,8 +7,6 @@ stages:

 check-commit-log:
  stage: review
-  variables:
-    GIT_DEPTH: "100"
  script:
    - ./.gitlab-ci/check-commit-log.sh
  only:
@@ -17,7 +15,7 @@ check-commit-log:
 build-mutter:
  stage: build
  script:
-    - meson . build -Dbuildtype=debugoptimized -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
+    - meson . build -Dbuildtype=debugoptimized -Degl_device=true -Dwayland_eglstream=true --werror
    - ninja -C build
    - ninja -C build install
  artifacts:
@@ -35,29 +33,12 @@ test-mutter:
  variables:
    XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
    GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data"
-    MALLOC_CHECK_: "3"
-    NO_AT_BRIDGE: "1"
  script:
    - mkdir -m 700 $XDG_RUNTIME_DIR
    - glib-compile-schemas $GSETTINGS_SCHEMA_DIR
    - >
-      env MALLOC_PERTURB_="$((RANDOM % 256 + 1))"
      dbus-run-session -- xvfb-run -s '+iglx -noreset'
      meson test -C build --no-rebuild -t 10 --verbose --no-stdsplit --wrap catchsegv
  only:
    - merge_requests
    - /^.*$/
-
-can-build-gnome-shell:
-  stage: test
-  dependencies:
-    - build-mutter
-  before_script:
-    - meson install --no-rebuild -C build
-  script:
-    - .gitlab-ci/checkout-gnome-shell.sh
-    - meson gnome-shell gnome-shell/build --prefix /usr
-    - ninja -C gnome-shell/build install
-  only:
-    - merge_requests
-    - /^.*$/
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,26 +1,17 @@
-FROM fedora:30
+FROM fedora:29

 RUN dnf -y update && dnf -y upgrade && \
    dnf install -y 'dnf-command(builddep)' && \
-    dnf install -y 'dnf-command(copr)' && \
-    dnf copr enable -y fmuellner/gnome-shell-ci && \
-
    dnf builddep -y mutter && \

    # Until Fedora catches up with meson build-deps
    dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \

    # For running unit tests
-    dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 '*/xvfb-run' gdm-lib accountsservice-libs && \
+    dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \

    # Unpackaged versions
-    dnf install -y https://copr-be.cloud.fedoraproject.org/results/jadahl/mutter-ci/fedora-29-x86_64/00834984-gsettings-desktop-schemas/gsettings-desktop-schemas-3.30.1-1.20181206git918efdd69be53.fc29.x86_64.rpm https://copr-be.cloud.fedoraproject.org/results/jadahl/mutter-ci/fedora-29-x86_64/00834984-gsettings-desktop-schemas/gsettings-desktop-schemas-devel-3.30.1-1.20181206git918efdd69be53.fc29.x86_64.rpm && \
+    dnf install -y https://copr-be.cloud.fedoraproject.org/results/jadahl/mutter-ci/fedora-29-x86_64/00848426-gsettings-desktop-schemas/gsettings-desktop-schemas-3.30.1-1.20181206git918efdd69be53.fc29.x86_64.rpm https://copr-be.cloud.fedoraproject.org/results/jadahl/mutter-ci/fedora-29-x86_64/00848426-gsettings-desktop-schemas/gsettings-desktop-schemas-devel-3.30.1-1.20181206git918efdd69be53.fc29.x86_64.rpm && \

    dnf install -y intltool redhat-rpm-config make && \
-
-    # GNOME Shell
-    dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \
-    dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel upower-devel python3-devel && \
-    dnf remove -y --noautoremove mutter mutter-devel && \
-
    dnf clean all
--- a/.gitlab-ci/check-commit-log.sh
+++ b/.gitlab-ci/check-commit-log.sh
@@ -23,35 +23,9 @@ function commit_message_has_url() {
  return $?
 }

-function commit_message_subject_is_compliant() {
-  commit=$1
-  commit_message_subject=$(git show -s --format='format:%s' $commit)
-
-  if echo "$commit_message_subject" | grep -qe "\(^meta-\|^Meta\)"; then
-    echo " - message subject should not be prefixed with 'meta-' or 'Meta'"
-    return 1
-  fi
-
-  if echo "$commit_message_subject" | grep -qe "\.[ch]:"; then
-    echo " - message subject prefix should not include .c, .h, etc."
-    return 1
-  fi
-
-  return 0
-}
-
 for commit in $commits; do
-  commit_short=$(echo $commit | cut -c -8)
-
  if ! commit_message_has_url $commit; then
-    echo "Missing merge request or issue URL on commit $commit_short"
-    exit 1
-  fi
-
-  errors=$(commit_message_subject_is_compliant $commit)
-  if [ $? != 0 ]; then
-    echo "Commit message for $commit_short is not compliant:"
-    echo "$errors"
+    echo "Missing merge request or issue URL on commit $(echo $commit | cut -c -8)"
    exit 1
  fi
 done
--- a/.gitlab-ci/checkout-gnome-shell.sh
+++ b/.gitlab-ci/checkout-gnome-shell.sh
@@ -1,35 +0,0 @@
-#!/usr/bin/bash
-
-mutter_branch=$(git describe --contains --all HEAD)
-gnome_shell_target=
-
-git clone https://gitlab.gnome.org/GNOME/gnome-shell.git
-
-if [ $? -ne 0 ]; then
-  echo Checkout failed
-  exit 1
-fi
-
-cd gnome-shell
-
-if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-  merge_request_remote=${CI_MERGE_REQUEST_SOURCE_PROJECT_URL//mutter/gnome-shell}
-  merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-
-  echo Looking for $merge_request_branch on remote ...
-  if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
-    gnome_shell_target=FETCH_HEAD
-  else
-    gnome_shell_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-    echo Using $gnome_shell_target instead
-  fi
-fi
-
-if [ -z "$gnome_shell_target" ]; then
-  gnome_shell_target=$(git branch -r -l origin/$mutter_branch)
-  gnome_shell_target=${gnome_shell_target:-$(git branch -r -l ${mutter_branch#remotes/})}
-  gnome_shell_target=${gnome_shell_target:-origin/master}
-  echo Using $gnome_shell_target instead
-fi
-
-git checkout -q $gnome_shell_target
--- a/88
+++ b/88
@@ -1,91 +1,3 @@
-3.33.1
-======
-* Remove unused APIs and outdated driver support
-  [Adam; !481, !468, !489, !487, !546]
-* Enable EGL_IMG_context_priority [Adam; !454]
-* Disable mouse keys with Numlock on [Olivier; #530]
-* Fix crash when restarting on X11 [Marco; #576]
-* Implement clipboard manager [Carlos; !320]
-* Fix spurious idle signals that prevent session unblank [Jonas Å.; !543]
-* Fix mapping of touchscreens that don't report dimensions [Carlos; #581]
-* Fix propagating fractional scaling factor [Robert; !537]
-* Add experimental RT scheduling support [Carlos; !460]
-* Misc. bug fixes and cleanups [Robert, Carlos, Olivier, Ray, Marco, Jonas D.,
-  Georges, Daniel V., Daniel M; !467, !504, !551, !552, #575, #556, !557, !442,
-  !562, !535, !548, #586, !567, !396, !422, !507]
-
-Contributors:
-  Jonas Ådahl, Piotr Drąg, Jonas Dreßler, Olivier Fourdan, Carlos Garnacho,
-  Adam Jackson, Robert Mader, Daniel García Moreno, Florian Müllner,
-  Georges Basile Stavracas Neto, Ray Strode, Marco Trevisan (Treviño),
-  Daniel van Vugt
-
-Translators:
-  Daniel Mustieles [es], Fabio Tomat [fur], Kukuh Syafaat [id]
-
-3.32.1
-======
-* Fix fallback app menu on wayland [Florian; #493]
-* Fix elogind support [Tom; !491]
-* Fix startup notifications not timing out [Carlos; #501]
-* Fix keyboard accessibility toggle from keys
-  [Olivier, Carlos; !501, #529, !531]
-* Fix touchscreen input on rotated displays [Carlos; #514]
-* Work around hangul text input bug [Carlos; #1365]
-* Fix blurry wallpaper scaling [Daniel; !505]
-* Fix placement of window menu when using fractional scaling [Jan; #527]
-* Fix repaint issues of offscreen effects on secondary monitors [Daniel; !511]
-* Fix windows not getting focus after launch [Daniel; #505]
-* Properly advertise support for 'underscan' property [Jonas; !507]
-* Improve power-saving handling [Jonas; !506]
-* Fix moving windows by super+touch [Jonas D.; !495]
-* Misc. bug fixes and cleanups [Benjamin, Florian, Adam, Marco, Pablo,
-  Erik, Jonas, Heiher, Pekka, Daniel, Olivier, Carlos; !478, !475, !480,
-  !482, #490, !488, #491, #480, !477, !496, !492, !485, !515, !519, !521,
-  !216, !538, #541, #523]
-
-Contributors:
-  Jonas Ådahl, Pablo Barciela, Benjamin Berg, Tom Briden, Jonas Dreßler,
-  Olivier Fourdan, Carlos Garnacho, Jan Alexander Steffens (heftig), Heiher,
-  Adam Jackson, Erik Kurzinger, Florian Müllner, Pekka Paalanen,
-  Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Khaled Hosny [ar], Goran Vidović [hr], Daniel Mustieles [es]
-
-3.32.0
-======
-* Fix deadlock when cancelling a theme sound [Andrea; !474]
-* Stop swizzling BGRA buffers (bye-bye inverted colors in screenshots
-  and animations) [Carlos; !486]
-
-Contributors:
-  Andrea Azzarone, Carlos Garnacho, Robert Mader
-
-3.31.92
-=======
-* Fix flicker of apps that use multiple SHM buffers [Jonas Å.; #199]
-* Don't disable page flips after temporary failues [Jonas Å.; #460]
-* Improve redraw performance [Carlos; !196]
-* Add cursor-mode support to window screencasting [Jonas Å.; !413]
-* Add back support for system-wide monitor configurations [Jonas Å.; !253]
-* Add fractional scaling support [Marco, Jonas Å.; !3]
-* Consider remapped keys when guessing keycode from keysym [Andrea; #443]
-* Stop turning on-screen-keyboard off on focus changes [Carlos; !432]
-* Fix crashes [Robert, Carlos, Jonas D., Florian; !447, #361, !426, #479]
-* Misc. bug fixes and cleanups [Benjamin, Adam, Olivier, Niels, Piotr; !457,
-  !452, !459, !380, !361, !461, !464, !471, !473, !463]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Benjamin Berg, Piotr Drąg, Jonas Dreßler,
-  Olivier Fourdan, Carlos Garnacho, Niels De Graef, Adam Jackson, Robert Mader,
-  Florian Müllner, Marco Trevisan (Treviño)
-
-Translators:
-  Milo Casagrande [it], Tim Sabsch [de], Trần Ngọc Quân [vi],
-  Gwan-gyeong Mun [ko], Марко Костић [sr], Daniel Mustieles [es],
-  Rūdolfs Mazurs [lv], Nathan Follens [nl]
-
 3.31.91
 =======
 * Fix infinite loop in EDID matching [Marco; #459]
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
@@ -1044,8 +1044,10 @@ _cally_actor_clean_action_list (CallyActor *cally_actor)

  if (priv->action_list)
    {
-      g_list_free_full (priv->action_list,
-                        (GDestroyNotify) _cally_actor_destroy_action_info);
+      g_list_foreach (priv->action_list,
+                      (GFunc) _cally_actor_destroy_action_info,
+                      NULL);
+      g_list_free (priv->action_list);
      priv->action_list = NULL;
    }
 }
--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@@ -594,27 +594,6 @@ _clutter_actor_box_enlarge_for_effects (ClutterActorBox *box)
  box->y1 = box->y2 - height - 3;
 }

-/**
- * clutter_actor_box_scale:
- * @box: a #ClutterActorBox
- * @scale: scale factor for resizing this box
- *
- * Rescale the @box by provided @scale factor.
- *
- * Since: 1.6
- */
-void
-clutter_actor_box_scale (ClutterActorBox *box,
-                         gfloat           scale)
-{
-  g_return_if_fail (box != NULL);
-
-  box->x1 *= scale;
-  box->x2 *= scale;
-  box->y1 *= scale;
-  box->y2 *= scale;
-}
-
 G_DEFINE_BOXED_TYPE_WITH_CODE (ClutterActorBox, clutter_actor_box,
                               clutter_actor_box_copy,
                               clutter_actor_box_free,
--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@@ -577,7 +577,8 @@ _clutter_meta_group_clear_metas (ClutterMetaGroup *group)
 {
  g_list_foreach (group->meta, (GFunc) _clutter_actor_meta_set_actor, NULL);

-  g_list_free_full (group->meta, g_object_unref);
+  g_list_foreach (group->meta, (GFunc) g_object_unref, NULL);
+  g_list_free (group->meta);
  group->meta = NULL;
 }

--- a/clutter/clutter/clutter-actor-private.h
+++ b/clutter/clutter/clutter-actor-private.h
@@ -53,8 +53,7 @@ typedef enum
 * Controls some options for how clutter_actor_traverse() iterates
 * through the graph.
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ACTOR_TRAVERSE_DEPTH_FIRST   = 1L<<0,
  CLUTTER_ACTOR_TRAVERSE_BREADTH_FIRST = 1L<<1
 } ClutterActorTraverseFlags;
@@ -75,8 +74,7 @@ typedef enum
 * the continuing traversal. It may stop traversal completely, just
 * skip over children for the current actor or continue as normal.
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ACTOR_TRAVERSE_VISIT_CONTINUE       = 1L<<0,
  CLUTTER_ACTOR_TRAVERSE_VISIT_SKIP_CHILDREN  = 1L<<1,
  CLUTTER_ACTOR_TRAVERSE_VISIT_BREAK          = 1L<<2
@@ -315,11 +313,8 @@ void                            _clutter_actor_detach_clone
 void                            _clutter_actor_queue_redraw_on_clones                   (ClutterActor *actor);
 void                            _clutter_actor_queue_relayout_on_clones                 (ClutterActor *actor);
 void                            _clutter_actor_queue_only_relayout                      (ClutterActor *actor);
-void                            _clutter_actor_queue_update_resource_scale_recursive    (ClutterActor *actor);

 CoglFramebuffer *               _clutter_actor_get_active_framebuffer                   (ClutterActor *actor);
-gboolean                        _clutter_actor_get_real_resource_scale                  (ClutterActor *actor,
-                                                                                         float        *resource_scale);

 ClutterPaintNode *              clutter_actor_create_texture_paint_node                 (ClutterActor *self,
                                                                                         CoglTexture  *texture);
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -656,8 +656,7 @@
 * which indicates when to do something other than just enforce
 * invariants.
 */
-typedef enum
-{
+typedef enum {
  MAP_STATE_CHECK,           /* just enforce invariants. */
  MAP_STATE_MAKE_UNREALIZED, /* force unrealize, ignoring invariants,
                              * used when about to unparent.
@@ -699,8 +698,6 @@ struct _ClutterActorPrivate
  /* the cached transformation matrix; see apply_transform() */
  CoglMatrix transform;

-  float resource_scale;
-
  guint8 opacity;
  gint opacity_override;

@@ -807,9 +804,6 @@ struct _ClutterActorPrivate
  gpointer create_child_data;
  GDestroyNotify create_child_notify;

-  guint resolution_changed_id;
-  guint font_changed_id;
-
  /* bitfields: KEEP AT THE END */

  /* fixed position and sizes */
@@ -849,7 +843,6 @@ struct _ClutterActorPrivate
  guint needs_y_expand              : 1;
  guint needs_paint_volume_update   : 1;
  guint had_effects_on_last_paint_volume_update : 1;
-  guint needs_compute_resource_scale : 1;
 };

 enum
@@ -922,7 +915,6 @@ enum
  PROP_SCALE_CENTER_X, /* XXX:2.0 remove */
  PROP_SCALE_CENTER_Y, /* XXX:2.0 remove */
  PROP_SCALE_GRAVITY, /* XXX:2.0 remove */
-  PROP_RESOURCE_SCALE,

  PROP_ROTATION_ANGLE_X, /* XXX:2.0 rename to rotation-x */
  PROP_ROTATION_ANGLE_Y, /* XXX:2.0 rename to rotation-y */
@@ -1102,8 +1094,6 @@ static void clutter_actor_set_child_transform_internal (ClutterActor        *sel

 static void     clutter_actor_realize_internal          (ClutterActor *self);
 static void     clutter_actor_unrealize_internal        (ClutterActor *self);
-static gboolean clutter_actor_update_resource_scale     (ClutterActor *self);
-static void     clutter_actor_ensure_resource_scale     (ClutterActor *self);

 static void clutter_actor_push_in_cloned_branch (ClutterActor *self,
                                                 gulong        count);
@@ -1530,8 +1520,6 @@ clutter_actor_real_map (ClutterActor *self)
                priv->pick_id,
                _clutter_actor_get_debug_name (self));

-  clutter_actor_ensure_resource_scale (self);
-
  /* notify on parent mapped before potentially mapping
   * children, so apps see a top-down notification.
   */
@@ -2789,16 +2777,6 @@ clutter_actor_real_queue_redraw (ClutterActor       *self,
  return FALSE;
 }

-static inline gboolean
-clutter_actor_needs_relayout (ClutterActor *self)
-{
-  ClutterActorPrivate *priv = self->priv;
-
-  return (priv->needs_width_request ||
-          priv->needs_height_request ||
-          priv->needs_allocation);
-}
-
 static void
 clutter_actor_real_queue_relayout (ClutterActor *self)
 {
@@ -3858,8 +3836,6 @@ clutter_actor_paint (ClutterActor *self)
  if (!CLUTTER_ACTOR_IS_MAPPED (self))
    return;

-  clutter_actor_ensure_resource_scale (self);
-
  stage = (ClutterStage *) _clutter_actor_get_stage_internal (self);

  /* mark that we are in the paint process */
@@ -4010,12 +3986,12 @@ clutter_actor_paint (ClutterActor *self)
                  pick_mode == CLUTTER_PICK_NONE))
    _clutter_actor_draw_paint_volume (self);

+done:
  /* If we make it here then the actor has run through a complete
     paint run including all the effects so it's no longer dirty */
  if (pick_mode == CLUTTER_PICK_NONE)
    priv->is_dirty = FALSE;

-done:
  if (clip_set)
    {
      CoglFramebuffer *fb = _clutter_stage_get_active_framebuffer (stage);
@@ -4225,8 +4201,7 @@ remove_child (ClutterActor *self,
  child->priv->next_sibling = NULL;
 }

-typedef enum
-{
+typedef enum {
  REMOVE_CHILD_DESTROY_META       = 1 << 0,
  REMOVE_CHILD_EMIT_PARENT_SET    = 1 << 1,
  REMOVE_CHILD_EMIT_ACTOR_REMOVED = 1 << 2,
@@ -4362,10 +4337,7 @@ clutter_actor_remove_child_internal (ClutterActor                 *self,

  /* clutter_actor_reparent() will emit ::parent-set for us */
  if (emit_parent_set && !CLUTTER_ACTOR_IN_REPARENT (child))
-    {
-      child->priv->needs_compute_resource_scale = TRUE;
-      g_signal_emit (child, actor_signals[PARENT_SET], 0, self);
-    }
+    g_signal_emit (child, actor_signals[PARENT_SET], 0, self);

  /* if the child was mapped then we need to relayout ourselves to account
   * for the removed child
@@ -5690,16 +5662,6 @@ clutter_actor_get_property (GObject    *object,
      g_value_set_enum (value, clutter_actor_get_scale_gravity (actor));
      break;

-    case PROP_RESOURCE_SCALE:
-      if (priv->needs_compute_resource_scale)
-        {
-          if (!clutter_actor_update_resource_scale (actor))
-            g_warning ("Getting invalid resource scale property");
-        }
-
-      g_value_set_float (value, priv->resource_scale);
-      break;
-
    case PROP_REACTIVE:
      g_value_set_boolean (value, clutter_actor_get_reactive (actor));
      break;
@@ -5986,7 +5948,6 @@ clutter_actor_dispose (GObject *object)
 {
  ClutterActor *self = CLUTTER_ACTOR (object);
  ClutterActorPrivate *priv = self->priv;
-  ClutterBackend *backend = clutter_get_default_backend ();

  CLUTTER_NOTE (MISC, "Dispose actor (name='%s', ref_count:%d) of type '%s'",
 		_clutter_actor_get_debug_name (self),
@@ -6023,18 +5984,6 @@ clutter_actor_dispose (GObject *object)
      g_assert (!CLUTTER_ACTOR_IS_REALIZED (self));
    }

-  if (priv->resolution_changed_id)
-    {
-      g_signal_handler_disconnect (backend, priv->resolution_changed_id);
-      priv->resolution_changed_id = 0;
-    }
-
-  if (priv->font_changed_id)
-    {
-      g_signal_handler_disconnect (backend, priv->font_changed_id);
-      priv->font_changed_id = 0;
-    }
-
  g_clear_object (&priv->pango_context);
  g_clear_object (&priv->actions);
  g_clear_object (&priv->constraints);
@@ -7166,19 +7115,6 @@ clutter_actor_class_init (ClutterActorClass *klass)
                       G_PARAM_STATIC_STRINGS |
                       G_PARAM_DEPRECATED);

-  /**
-   * ClutterActor:resource-scale:
-   *
-   * The resource-scale of the #ClutterActor if any or -1 if not available
-   */
-  obj_props[PROP_RESOURCE_SCALE] =
-    g_param_spec_float ("resource-scale",
-                        P_("Resource Scale"),
-                        P_("The Scaling factor for resources painting"),
-                        -1.0f, G_MAXFLOAT,
-                        1.0f,
-                        CLUTTER_PARAM_READABLE);
-
  /**
   * ClutterActor:rotation-angle-x:
   *
@@ -8618,13 +8554,11 @@ clutter_actor_init (ClutterActor *self)

  priv->opacity = 0xff;
  priv->show_on_set_parent = TRUE;
-  priv->resource_scale = -1.0f;

  priv->needs_width_request = TRUE;
  priv->needs_height_request = TRUE;
  priv->needs_allocation = TRUE;
  priv->needs_paint_volume_update = TRUE;
-  priv->needs_compute_resource_scale = TRUE;

  priv->cached_width_age = 1;
  priv->cached_height_age = 1;
@@ -8849,9 +8783,9 @@ _clutter_actor_queue_redraw_full (ClutterActor             *self,
   *
   * later during _clutter_stage_do_update(), once relayouting is done
   * and the scenegraph has been updated we will call:
-   * clutter_stage_maybe_finish_queue_redraws().
+   * _clutter_stage_finish_queue_redraws().
   *
-   * clutter_stage_maybe_finish_queue_redraws() will call
+   * _clutter_stage_finish_queue_redraws() will call
   * _clutter_actor_finish_queue_redraw() for each listed actor.
   *
   * Note: actors *are* allowed to queue further redraws during this
@@ -9584,8 +9518,6 @@ clutter_actor_get_preferred_width (ClutterActor *self,
      return;
    }

-  CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_IN_PREF_WIDTH);
-
  /* the remaining cases are:
   *
   *   - either min_width or natural_width have been set
@@ -9677,8 +9609,6 @@ clutter_actor_get_preferred_width (ClutterActor *self,

  if (natural_width_p)
    *natural_width_p = request_natural_width;
-
-  CLUTTER_UNSET_PRIVATE_FLAGS (self, CLUTTER_IN_PREF_WIDTH);
 }

 /**
@@ -9732,8 +9662,6 @@ clutter_actor_get_preferred_height (ClutterActor *self,
      return;
    }

-  CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_IN_PREF_HEIGHT);
-
  /* the remaining cases are:
   *
   *   - either min_height or natural_height have been set
@@ -9824,8 +9752,6 @@ clutter_actor_get_preferred_height (ClutterActor *self,

  if (natural_height_p)
    *natural_height_p = request_natural_height;
-
-  CLUTTER_UNSET_PRIVATE_FLAGS (self, CLUTTER_IN_PREF_HEIGHT);
 }

 /**
@@ -10168,9 +10094,6 @@ clutter_actor_allocate (ClutterActor           *self,
  if (CLUTTER_ACTOR_IS_MAPPED (self))
    self->priv->needs_paint_volume_update = TRUE;

-  if (stage_allocation_changed)
-    priv->needs_compute_resource_scale = TRUE;
-
  if (!stage_allocation_changed)
    {
      /* If the actor didn't move but needs_allocation is set, we just
@@ -12833,8 +12756,7 @@ typedef void (* ClutterActorAddChildFunc) (ClutterActor *parent,
                                           ClutterActor *child,
                                           gpointer      data);

-typedef enum
-{
+typedef enum {
  ADD_CHILD_CREATE_META        = 1 << 0,
  ADD_CHILD_EMIT_PARENT_SET    = 1 << 1,
  ADD_CHILD_EMIT_ACTOR_ADDED   = 1 << 2,
@@ -13019,10 +12941,7 @@ clutter_actor_add_child_internal (ClutterActor              *self,

  /* clutter_actor_reparent() will emit ::parent-set for us */
  if (emit_parent_set && !CLUTTER_ACTOR_IN_REPARENT (child))
-    {
-      child->priv->needs_compute_resource_scale = TRUE;
-      g_signal_emit (child, actor_signals[PARENT_SET], 0, NULL);
-    }
+    g_signal_emit (child, actor_signals[PARENT_SET], 0, NULL);

  if (check_state)
    {
@@ -13055,7 +12974,9 @@ clutter_actor_add_child_internal (ClutterActor              *self,
  /* maintain the invariant that if an actor needs layout,
   * its parents do as well
   */
-  if (clutter_actor_needs_relayout (child))
+  if (child->priv->needs_width_request ||
+      child->priv->needs_height_request ||
+      child->priv->needs_allocation)
    {
      /* we work around the short-circuiting we do
       * in clutter_actor_queue_relayout() since we
@@ -13624,8 +13545,6 @@ clutter_actor_reparent (ClutterActor *self,
                                          insert_child_at_depth,
                                          NULL);

-      priv->needs_compute_resource_scale = TRUE;
-
      /* we emit the ::parent-set signal once */
      g_signal_emit (self, actor_signals[PARENT_SET], 0, old_parent);

@@ -15900,12 +15819,10 @@ clutter_actor_get_pango_context (ClutterActor *self)
    {
      priv->pango_context = clutter_actor_create_pango_context (self);

-      priv->resolution_changed_id =
-        g_signal_connect_object (backend, "resolution-changed",
-                                 G_CALLBACK (update_pango_context), priv->pango_context, 0);
-      priv->font_changed_id =
-        g_signal_connect_object (backend, "font-changed",
-                                 G_CALLBACK (update_pango_context), priv->pango_context, 0);
+      g_signal_connect_object (backend, "resolution-changed",
+                               G_CALLBACK (update_pango_context), priv->pango_context, 0);
+      g_signal_connect_object (backend, "font-changed",
+                               G_CALLBACK (update_pango_context), priv->pango_context, 0);
    }
  else
    update_pango_context (backend, priv->pango_context);
@@ -17797,171 +17714,6 @@ clutter_actor_get_paint_box (ClutterActor    *self,
  return TRUE;
 }

-static gboolean
-_clutter_actor_get_resource_scale_for_rect (ClutterActor *self,
-                                            ClutterRect  *bounding_rect,
-                                            float        *resource_scale)
-{
-  ClutterActor *stage;
-  float max_scale = 0;
-
-  stage = _clutter_actor_get_stage_internal (self);
-  if (!stage)
-    return FALSE;
-
-  if (!_clutter_stage_get_max_view_scale_factor_for_rect (CLUTTER_STAGE (stage),
-                                                          bounding_rect,
-                                                          &max_scale))
-    return FALSE;
-
-  *resource_scale = max_scale;
-
-  return TRUE;
-}
-
-static gboolean
-_clutter_actor_compute_resource_scale (ClutterActor *self,
-                                       float        *resource_scale)
-{
-  ClutterRect bounding_rect;
-  ClutterActorPrivate *priv = self->priv;
-
-  if (CLUTTER_ACTOR_IN_DESTRUCTION (self) ||
-      CLUTTER_ACTOR_IN_PREF_SIZE (self) ||
-      !clutter_actor_is_mapped (self))
-    {
-      return FALSE;
-    }
-
-  clutter_actor_get_transformed_position (self,
-                                          &bounding_rect.origin.x,
-                                          &bounding_rect.origin.y);
-  clutter_actor_get_transformed_size (self,
-                                      &bounding_rect.size.width,
-                                      &bounding_rect.size.height);
-
-  if (bounding_rect.size.width == 0.0 ||
-      bounding_rect.size.height == 0.0 ||
-      !_clutter_actor_get_resource_scale_for_rect (self,
-                                                   &bounding_rect,
-                                                   resource_scale))
-    {
-      if (priv->parent)
-        return _clutter_actor_compute_resource_scale (priv->parent,
-                                                      resource_scale);
-      else
-        return FALSE;
-    }
-
-  return TRUE;
-}
-
-static ClutterActorTraverseVisitFlags
-queue_update_resource_scale_cb (ClutterActor *actor,
-                                int           depth,
-                                void         *user_data)
-{
-  actor->priv->needs_compute_resource_scale = TRUE;
-  return CLUTTER_ACTOR_TRAVERSE_VISIT_CONTINUE;
-}
-
-void
-_clutter_actor_queue_update_resource_scale_recursive (ClutterActor *self)
-{
-  _clutter_actor_traverse (self,
-                           CLUTTER_ACTOR_TRAVERSE_DEPTH_FIRST,
-                           queue_update_resource_scale_cb,
-                           NULL,
-                           NULL);
-}
-
-static gboolean
-clutter_actor_update_resource_scale (ClutterActor *self)
-{
-  ClutterActorPrivate *priv;
-  float resource_scale;
-  float old_resource_scale;
-  priv = self->priv;
-
-  g_return_val_if_fail (priv->needs_compute_resource_scale, FALSE);
-
-  old_resource_scale = priv->resource_scale;
-  priv->resource_scale = -1.0f;
-
-  if (_clutter_actor_compute_resource_scale (self, &resource_scale))
-    {
-      priv->resource_scale = resource_scale;
-      priv->needs_compute_resource_scale = FALSE;
-
-      return fabsf (old_resource_scale - resource_scale) > FLT_EPSILON;
-    }
-
-  return FALSE;
-}
-
-static void
-clutter_actor_ensure_resource_scale (ClutterActor *self)
-{
-  ClutterActorPrivate *priv = self->priv;
-
-  if (!priv->needs_compute_resource_scale)
-    return;
-
-  if (clutter_actor_update_resource_scale (self))
-    g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_RESOURCE_SCALE]);
-}
-
-gboolean
-_clutter_actor_get_real_resource_scale (ClutterActor *self,
-                                        gfloat       *resource_scale)
-{
-  ClutterActorPrivate *priv = self->priv;
-
-  clutter_actor_ensure_resource_scale (self);
-
-  if (!priv->needs_compute_resource_scale)
-    {
-      *resource_scale = priv->resource_scale;
-      return TRUE;
-    }
-
-  *resource_scale = -1.0f;
-  return FALSE;
-}
-
-/**
- * clutter_actor_get_resource_scale:
- * @self: A #ClutterActor
- * @resource_scale: (out): return location for the resource scale
- *
- * Retrieves the resource scale for this actor, if available.
- *
- * The resource scale refers to the scale the actor should use for its resources.
- * For example if an actor draws a a picture of size 100 x 100 in the stage
- * coordinate space, it should use a texture of twice the size (i.e. 200 x 200)
- * if the resource scale is 2.
- *
- * The resource scale is determined by calculating the highest #ClutterStageView
- * scale the actor will get painted on.
- *
- * Returns: TRUE if resource scale is set for the actor, otherwise FALSE
- */
-gboolean
-clutter_actor_get_resource_scale (ClutterActor *self,
-                                  gfloat       *resource_scale)
-{
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (self), FALSE);
-  g_return_val_if_fail (resource_scale != NULL, FALSE);
-
-  if (_clutter_actor_get_real_resource_scale (self, resource_scale))
-    {
-      *resource_scale = ceilf (*resource_scale);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 /**
 * clutter_actor_has_overlaps:
 * @self: A #ClutterActor
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -584,11 +584,6 @@ gboolean                        clutter_actor_is_in_clone_paint
 CLUTTER_EXPORT
 gboolean                        clutter_actor_get_paint_box                     (ClutterActor               *self,
                                                                                 ClutterActorBox            *box);
-
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_resource_scale                (ClutterActor *self,
-                                                                                 gfloat       *resource_scale);
-
 CLUTTER_EXPORT
 gboolean                        clutter_actor_has_overlaps                      (ClutterActor               *self);

--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -160,6 +160,8 @@ void                    _clutter_backend_reset_cogl_framebuffer         (Clutter

 void                    clutter_set_allowed_drivers                     (const char             *drivers);

+void                    clutter_try_set_windowing_backend               (const char             *drivers);
+
 G_END_DECLS

 #endif /* __CLUTTER_BACKEND_PRIVATE_H__ */
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -1094,6 +1094,61 @@ clutter_wayland_set_compositor_display (void *display)
 }
 #endif

+/**
+ * clutter_set_windowing_backend:
+ * @backend_type: a comma separated list of windowing backends
+ *
+ * Restricts Clutter to only use the specified backend or list of backends.
+ *
+ * You can use one of the `CLUTTER_WINDOWING_*` symbols, e.g.
+ *
+ * |[<!-- language="C" -->
+ *   clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
+ * ]|
+ *
+ * Will force Clutter to use the X11 windowing and input backend, and terminate
+ * if the X11 backend could not be initialized successfully.
+ *
+ * Since Clutter 1.26, you can also use a comma-separated list of windowing
+ * system backends to provide a fallback in case backends are not available or
+ * enabled, e.g.:
+ *
+ * |[<!-- language="C" -->
+ *   clutter_set_windowing_backend ("gdk,wayland,x11");
+ * ]|
+ *
+ * Will make Clutter test for the GDK, Wayland, and X11 backends in that order.
+ *
+ * You can use the `*` special value to ask Clutter to use the internally
+ * defined list of backends. For instance:
+ *
+ * |[<!-- language="C" -->
+ *   clutter_set_windowing_backend ("x11,wayland,*");
+ * ]|
+ *
+ * Will make Clutter test the X11 and Wayland backends, and then fall back
+ * to the internal list of available backends.
+ *
+ * This function must be called before the first API call to Clutter, including
+ * clutter_get_option_context()
+ *
+ * Since: 1.16
+ */
+void
+clutter_set_windowing_backend (const char *backend_type)
+{
+  g_return_if_fail (backend_type != NULL);
+
+  allowed_backends = g_strdup (backend_type);
+}
+
+void
+clutter_try_set_windowing_backend (const char *backend_type)
+{
+  if (allowed_backends == NULL)
+    clutter_set_windowing_backend (backend_type);
+}
+
 PangoDirection
 _clutter_backend_get_keymap_direction (ClutterBackend *backend)
 {
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@@ -60,6 +60,9 @@ GType clutter_backend_get_type (void) G_GNUC_CONST;
 CLUTTER_EXPORT
 ClutterBackend *                clutter_get_default_backend             (void);

+CLUTTER_EXPORT
+void                            clutter_set_windowing_backend           (const char *backend_type);
+
 CLUTTER_EXPORT
 gdouble                         clutter_backend_get_resolution          (ClutterBackend             *backend);

--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
@@ -1146,60 +1146,29 @@ clutter_rect_inset (ClutterRect *rect,
    rect->size.height = 0.f;
 }

-/**
- * clutter_rect_scale:
- * @rect: a #ClutterRect
- * @s_x: an horizontal scale value
- * @s_y: a vertical scale value
- *
- * Scale the rectangle coordinates and size by @s_x horizontally and
- * @s_y vertically.
- */
-void
-clutter_rect_scale (ClutterRect *rect,
-                    float        s_x,
-                    float        s_y)
-{
-  g_return_if_fail (rect != NULL);
-  g_return_if_fail (s_x > 0.f);
-  g_return_if_fail (s_y > 0.f);
-
-  clutter_rect_normalize_internal (rect);
-
-  rect->origin.x *= s_x;
-  rect->origin.y *= s_y;
-  rect->size.width *= s_x;
-  rect->size.height *= s_y;
-}
-
 /**
 * clutter_rect_clamp_to_pixel:
 * @rect: a #ClutterRect
 *
- * Rounds the origin of @rect downwards to the nearest integer, and recompute the
- * the size using the @rect origin and size rounded upwards to the nearest integer,
- * so that @rect is updated to the smallest rectangle capable of fully containing
- * the original, fractional rectangle in the coordinates space.
+ * Rounds the origin of @rect downwards to the nearest integer, and rounds
+ * the size of @rect upwards to the nearest integer, so that @rect is
+ * updated to the smallest rectangle capable of fully containing the
+ * original, fractional rectangle.
 *
 * Since: 1.12
 */
 void
 clutter_rect_clamp_to_pixel (ClutterRect *rect)
 {
-  float x2, y2;
-
  g_return_if_fail (rect != NULL);

  clutter_rect_normalize_internal (rect);

-  x2 = rect->origin.x + rect->size.width;
-  y2 = rect->origin.y + rect->size.height;
-
  rect->origin.x = floorf (rect->origin.x);
  rect->origin.y = floorf (rect->origin.y);

-  rect->size.width = ceilf (x2) - rect->origin.x;
-  rect->size.height = ceilf (y2) - rect->origin.y;
+  rect->size.width = ceilf (rect->size.width);
+  rect->size.height = ceilf (rect->size.height);
 }

 /**
--- a/clutter/clutter/clutter-binding-pool.c
+++ b/clutter/clutter/clutter-binding-pool.c
@@ -235,7 +235,8 @@ clutter_binding_pool_finalize (GObject *gobject)

  g_hash_table_destroy (pool->entries_hash);

-  g_slist_free_full (pool->entries, (GDestroyNotify) binding_entry_free);
+  g_slist_foreach (pool->entries, (GFunc) binding_entry_free, NULL);
+  g_slist_free (pool->entries);

  G_OBJECT_CLASS (clutter_binding_pool_parent_class)->finalize (gobject);
 }
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@@ -249,7 +249,9 @@ clutter_blur_effect_init (ClutterBlurEffect *self)
      cogl_pipeline_add_layer_snippet (klass->base_pipeline, 0, snippet);
      cogl_object_unref (snippet);

-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
+                                            0, /* layer number */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -438,7 +438,9 @@ clutter_brightness_contrast_effect_init (ClutterBrightnessContrastEffect *self)
      cogl_pipeline_add_snippet (klass->base_pipeline, snippet);
      cogl_object_unref (snippet);

-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
+                                            0, /* layer number */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@@ -44,7 +44,6 @@

 #include "clutter-build-config.h"

-#include <math.h>
 #include <cogl/cogl.h>
 #include <cairo-gobject.h>

@@ -70,7 +69,6 @@ struct _ClutterCanvasPrivate

  int width;
  int height;
-  float scale_factor;

  CoglTexture *texture;
  gboolean dirty;
@@ -84,7 +82,6 @@ enum

  PROP_WIDTH,
  PROP_HEIGHT,
-  PROP_SCALE_FACTOR,

  LAST_PROP
 };
@@ -181,19 +178,6 @@ clutter_canvas_set_property (GObject      *gobject,
      }
      break;

-    case PROP_SCALE_FACTOR:
-      {
-        gfloat new_scale_factor = g_value_get_float (value);
-
-        if (priv->scale_factor != new_scale_factor)
-          {
-            priv->scale_factor = new_scale_factor;
-
-            clutter_content_invalidate (CLUTTER_CONTENT (gobject));
-          }
-      }
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
@@ -218,10 +202,6 @@ clutter_canvas_get_property (GObject    *gobject,
      g_value_set_int (value, priv->height);
      break;

-    case PROP_SCALE_FACTOR:
-      g_value_set_float (value, priv->scale_factor);
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
@@ -265,19 +245,6 @@ clutter_canvas_class_init (ClutterCanvasClass *klass)
                      G_PARAM_READWRITE |
                      G_PARAM_STATIC_STRINGS);

-  /**
-   * ClutterCanvas:scale-factor:
-   *
-   * The height of the canvas.
-   */
-  obj_props[PROP_SCALE_FACTOR] =
-    g_param_spec_float ("scale-factor",
-                        P_("Scale Factor"),
-                        P_("The Scale factor of the canvas"),
-                        0.01f, G_MAXFLOAT,
-                        1.0f,
-                        G_PARAM_READWRITE |
-                        G_PARAM_STATIC_STRINGS);

  /**
   * ClutterCanvas::draw:
@@ -324,7 +291,6 @@ clutter_canvas_init (ClutterCanvas *self)

  self->priv->width = -1;
  self->priv->height = -1;
-  self->priv->scale_factor = 1.0f;
 }

 static void
@@ -374,8 +340,8 @@ clutter_canvas_emit_draw (ClutterCanvas *self)

  priv->dirty = TRUE;

-  real_width = ceilf (priv->width * priv->scale_factor);
-  real_height = ceilf (priv->height * priv->scale_factor);
+  real_width = priv->width;
+  real_height = priv->height;

  CLUTTER_NOTE (MISC, "Creating Cairo surface with size %d x %d",
                priv->width, priv->height);
@@ -421,10 +387,6 @@ clutter_canvas_emit_draw (ClutterCanvas *self)
      mapped_buffer = FALSE;
    }

-  cairo_surface_set_device_scale (surface,
-                                  priv->scale_factor,
-                                  priv->scale_factor);
-
  self->priv->cr = cr = cairo_create (surface);

  g_signal_emit (self, canvas_signals[DRAW], 0,
@@ -486,10 +448,10 @@ clutter_canvas_get_preferred_size (ClutterContent *content,
    return FALSE;

  if (width != NULL)
-    *width = ceilf (priv->width * priv->scale_factor);
+    *width = priv->width;

  if (height != NULL)
-    *height = ceilf (priv->height * priv->scale_factor);
+    *height = priv->height;

  return TRUE;
 }
@@ -598,48 +560,3 @@ clutter_canvas_set_size (ClutterCanvas *canvas,

  return clutter_canvas_invalidate_internal (canvas, width, height);
 }
-
-/**
- * clutter_canvas_set_scale_factor:
- * @canvas: a #ClutterCanvas
- * @scale: the integer scaling factor of the canvas
- *
- * Sets the scaling factor of the @canvas, and invalidates the content.
- *
- * This function will cause the @canvas to be invalidated only
- * if the scale factor of the canvas surface has changed.
- */
-void
-clutter_canvas_set_scale_factor (ClutterCanvas *canvas,
-                                 float          scale)
-{
-  g_return_if_fail (CLUTTER_IS_CANVAS (canvas));
-  g_return_if_fail (scale > 0.0f);
-
-  if (canvas->priv->scale_factor != scale)
-    {
-      canvas->priv->scale_factor = scale;
-
-      g_object_freeze_notify (G_OBJECT (canvas));
-      clutter_content_invalidate (CLUTTER_CONTENT (canvas));
-      g_object_thaw_notify (G_OBJECT (canvas));
-
-      g_object_notify_by_pspec (G_OBJECT (canvas), obj_props[PROP_SCALE_FACTOR]);
-    }
-}
-
-/**
- * clutter_canvas_get_scale_factor:
- * @canvas: a #ClutterCanvas
- *
- * Gets the scale factor of the @canvas.
- *
- * Return value: the current @canvas scale factor or -1 if invalid
- */
-float
-clutter_canvas_get_scale_factor (ClutterCanvas *canvas)
-{
-  g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), -1.0f);
-
-  return canvas->priv->scale_factor;
-}
--- a/clutter/clutter/clutter-canvas.h
+++ b/clutter/clutter/clutter-canvas.h
@@ -97,9 +97,9 @@ gboolean                clutter_canvas_set_size                 (ClutterCanvas *

 CLUTTER_EXPORT
 void                    clutter_canvas_set_scale_factor         (ClutterCanvas *canvas,
-                                                                 float          scale);
+                                                                 int            scale);
 CLUTTER_EXPORT
-float                   clutter_canvas_get_scale_factor         (ClutterCanvas *canvas);
+int                     clutter_canvas_get_scale_factor         (ClutterCanvas *canvas);

 G_END_DECLS

--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -355,10 +355,6 @@ on_captured_event (ClutterActor       *stage,

  switch (clutter_event_type (event))
    {
-    case CLUTTER_TOUCH_CANCEL:
-      clutter_click_action_release (action);
-      break;
-
    case CLUTTER_TOUCH_END:
      has_button = FALSE;
    case CLUTTER_BUTTON_RELEASE:
--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@@ -293,7 +293,9 @@ clutter_colorize_effect_init (ClutterColorizeEffect *self)
      cogl_pipeline_add_snippet (klass->base_pipeline, snippet);
      cogl_object_unref (snippet);

-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
+                                            0, /* layer number */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
--- a/clutter/clutter/clutter-debug.h
+++ b/clutter/clutter/clutter-debug.h
@@ -6,8 +6,7 @@

 G_BEGIN_DECLS

-typedef enum
-{
+typedef enum {
  CLUTTER_DEBUG_MISC                = 1 << 0,
  CLUTTER_DEBUG_ACTOR               = 1 << 1,
  CLUTTER_DEBUG_TEXTURE             = 1 << 2,
@@ -27,14 +26,12 @@ typedef enum
  CLUTTER_DEBUG_OOB_TRANSFORMS      = 1 << 16
 } ClutterDebugFlag;

-typedef enum
-{
+typedef enum {
  CLUTTER_DEBUG_NOP_PICKING         = 1 << 0,
  CLUTTER_DEBUG_DUMP_PICK_BUFFERS   = 1 << 1
 } ClutterPickDebugFlag;

-typedef enum
-{
+typedef enum {
  CLUTTER_DEBUG_DISABLE_SWAP_EVENTS     = 1 << 0,
  CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS = 1 << 1,
  CLUTTER_DEBUG_REDRAWS                 = 1 << 2,
--- a/clutter/clutter/clutter-deform-effect.c
+++ b/clutter/clutter/clutter-deform-effect.c
@@ -282,7 +282,6 @@ clutter_deform_effect_paint_target (ClutterOffscreenEffect *effect)
  /* enable depth testing */
  cogl_depth_state_init (&depth_state);
  cogl_depth_state_set_test_enabled (&depth_state, TRUE);
-  cogl_depth_state_set_test_function (&depth_state, COGL_DEPTH_TEST_FUNCTION_LEQUAL);
  cogl_pipeline_set_depth_state (pipeline, &depth_state, NULL);

  /* enable backface culling if we have a back material */
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -9,16 +9,23 @@
 #include "deprecated/clutter-animation.h"
 #include "deprecated/clutter-behaviour.h"
 #include "deprecated/clutter-behaviour-depth.h"
+#include "deprecated/clutter-behaviour-ellipse.h"
 #include "deprecated/clutter-behaviour-opacity.h"
+#include "deprecated/clutter-behaviour-path.h"
+#include "deprecated/clutter-behaviour-rotate.h"
 #include "deprecated/clutter-behaviour-scale.h"
 #include "deprecated/clutter-bin-layout.h"
 #include "deprecated/clutter-box.h"
 #include "deprecated/clutter-cairo-texture.h"
 #include "deprecated/clutter-container.h"
 #include "deprecated/clutter-group.h"
+#include "deprecated/clutter-input-device.h"
 #include "deprecated/clutter-keysyms.h"
+#include "deprecated/clutter-list-model.h"
 #include "deprecated/clutter-main.h"
+#include "deprecated/clutter-model.h"
 #include "deprecated/clutter-rectangle.h"
+#include "deprecated/clutter-shader.h"
 #include "deprecated/clutter-stage-manager.h"
 #include "deprecated/clutter-stage.h"
 #include "deprecated/clutter-state.h"
--- a/clutter/clutter/clutter-desaturate-effect.c
+++ b/clutter/clutter/clutter-desaturate-effect.c
@@ -297,7 +297,9 @@ clutter_desaturate_effect_init (ClutterDesaturateEffect *self)
      cogl_pipeline_add_snippet (klass->base_pipeline, snippet);
      cogl_object_unref (snippet);

-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
+                                            0, /* layer number */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
--- a/clutter/clutter/clutter-device-manager-private.h
+++ b/clutter/clutter/clutter-device-manager-private.h
@@ -167,6 +167,10 @@ struct _ClutterInputDeviceClass
  gboolean (* is_grouped) (ClutterInputDevice *device,
                           ClutterInputDevice *other_device);

+  gboolean (* get_physical_size) (ClutterInputDevice *device,
+                                  gdouble            *width,
+                                  gdouble            *height);
+
  /* Keyboard accessbility */
  void (* process_kbd_a11y_event) (ClutterEvent               *event,
                                   ClutterInputDevice         *device,
--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@@ -550,7 +550,13 @@ static gboolean
 are_kbd_a11y_settings_equal (ClutterKbdA11ySettings *a,
                             ClutterKbdA11ySettings *b)
 {
-  return (memcmp (a, b, sizeof (ClutterKbdA11ySettings)) == 0);
+  return (a->controls == b->controls &&
+          a->slowkeys_delay == b->slowkeys_delay &&
+          a->debounce_delay == b->debounce_delay &&
+          a->timeout_delay == b->timeout_delay &&
+          a->mousekeys_init_delay == b->mousekeys_init_delay &&
+          a->mousekeys_max_speed == b->mousekeys_max_speed &&
+          a->mousekeys_accel_time == b->mousekeys_accel_time);
 }

 void
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -51,8 +51,7 @@ G_BEGIN_DECLS
 *
 * Deprecated: 1.22: Use the normalized #ClutterActor pivot point instead
 */
-typedef enum /*< prefix=CLUTTER_GRAVITY >*/
-{
+typedef enum { /*< prefix=CLUTTER_GRAVITY >*/
  CLUTTER_GRAVITY_NONE       = 0,
  CLUTTER_GRAVITY_NORTH,
  CLUTTER_GRAVITY_NORTH_EAST,
@@ -75,8 +74,7 @@ typedef enum /*< prefix=CLUTTER_GRAVITY >*/
 *
 * Since: 0.4
 */
-typedef enum /*< prefix=CLUTTER >*/
-{
+typedef enum { /*< prefix=CLUTTER >*/
  CLUTTER_X_AXIS,
  CLUTTER_Y_AXIS,
  CLUTTER_Z_AXIS
@@ -93,8 +91,7 @@ typedef enum /*< prefix=CLUTTER >*/
 *
 * Deprecated: 1.22
 */
-typedef enum /*< prefix=CLUTTER_ROTATE >*/
-{
+typedef enum { /*< prefix=CLUTTER_ROTATE >*/
  CLUTTER_ROTATE_CW,
  CLUTTER_ROTATE_CCW
 } ClutterRotateDirection;
@@ -110,8 +107,7 @@ typedef enum /*< prefix=CLUTTER_ROTATE >*/
 *
 * Since: 0.8
 */
-typedef enum /*< prefix=CLUTTER_REQUEST >*/
-{
+typedef enum { /*< prefix=CLUTTER_REQUEST >*/
  CLUTTER_REQUEST_HEIGHT_FOR_WIDTH,
  CLUTTER_REQUEST_WIDTH_FOR_HEIGHT,
  CLUTTER_REQUEST_CONTENT_SIZE
@@ -204,8 +200,7 @@ typedef enum /*< prefix=CLUTTER_REQUEST >*/
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_CUSTOM_MODE = 0,

  /* linear */
@@ -289,8 +284,7 @@ typedef enum
 *
 * Deprecated: 1.22: Use #cairo_font_options_t instead
 */
-typedef enum /*< prefix=CLUTTER_FONT >*/
-{
+typedef enum { /*< prefix=CLUTTER_FONT >*/
  CLUTTER_FONT_MIPMAPPING = (1 << 0),
  CLUTTER_FONT_HINTING    = (1 << 1)
 } ClutterFontFlags;
@@ -306,8 +300,7 @@ typedef enum /*< prefix=CLUTTER_FONT >*/
 *
 * Since: 1.2
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TEXT_DIRECTION_DEFAULT,
  CLUTTER_TEXT_DIRECTION_LTR,
  CLUTTER_TEXT_DIRECTION_RTL
@@ -322,8 +315,7 @@ typedef enum
 *
 * Since: 1.4
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_VERTEX_SHADER,
  CLUTTER_FRAGMENT_SHADER
 } ClutterShaderType;
@@ -358,8 +350,7 @@ typedef enum
 *
 * Since: 0.4
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SHIFT_MASK    = 1 << 0,
  CLUTTER_LOCK_MASK     = 1 << 1,
  CLUTTER_CONTROL_MASK  = 1 << 2,
@@ -425,8 +416,7 @@ typedef enum
 * Keyboard accessibility features applied to a ClutterInputDevice keyboard.
 *
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_A11Y_KEYBOARD_ENABLED          = 1 << 0,
  CLUTTER_A11Y_TIMEOUT_ENABLED           = 1 << 1,
  CLUTTER_A11Y_MOUSE_KEYS_ENABLED        = 1 << 2,
@@ -458,8 +448,7 @@ typedef enum
 *
 * Flags used to signal the state of an actor.
 */
-typedef enum /*< prefix=CLUTTER_ACTOR >*/
-{
+typedef enum { /*< prefix=CLUTTER_ACTOR >*/
  CLUTTER_ACTOR_MAPPED    = 1 << 1,
  CLUTTER_ACTOR_REALIZED  = 1 << 2,
  CLUTTER_ACTOR_REACTIVE  = 1 << 3,
@@ -479,8 +468,7 @@ typedef enum /*< prefix=CLUTTER_ACTOR >*/
 *
 * Since: 1.8
 */
-typedef enum /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/
-{
+typedef enum { /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/
  CLUTTER_OFFSCREEN_REDIRECT_AUTOMATIC_FOR_OPACITY = 1<<0,
  CLUTTER_OFFSCREEN_REDIRECT_ALWAYS = 1<<1
 } ClutterOffscreenRedirect;
@@ -504,8 +492,7 @@ typedef enum /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ALLOCATION_NONE         = 0,
  CLUTTER_ABSOLUTE_ORIGIN_CHANGED = 1 << 1,
  CLUTTER_DELEGATE_LAYOUT         = 1 << 2
@@ -522,8 +509,7 @@ typedef enum
 *
 * Since: 1.4
 */
-typedef enum /*< prefix=CLUTTER_ALIGN >*/
-{
+typedef enum { /*< prefix=CLUTTER_ALIGN >*/
  CLUTTER_ALIGN_X_AXIS,
  CLUTTER_ALIGN_Y_AXIS,
  CLUTTER_ALIGN_BOTH
@@ -540,8 +526,7 @@ typedef enum /*< prefix=CLUTTER_ALIGN >*/
 *
 * Deprecated: 1.22
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INTERPOLATION_LINEAR,
  CLUTTER_INTERPOLATION_CUBIC
 } ClutterInterpolation;
@@ -566,8 +551,7 @@ typedef enum
 * Deprecated: 1.12: Use #ClutterActorAlign and the #ClutterActor
 *   API instead
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_BIN_ALIGNMENT_FIXED,
  CLUTTER_BIN_ALIGNMENT_FILL,
  CLUTTER_BIN_ALIGNMENT_START,
@@ -592,8 +576,7 @@ typedef enum
 *
 * Since: 1.4
 */
-typedef enum /*< prefix=CLUTTER_BIND >*/
-{
+typedef enum { /*< prefix=CLUTTER_BIND >*/
  CLUTTER_BIND_X,
  CLUTTER_BIND_Y,
  CLUTTER_BIND_WIDTH,
@@ -612,8 +595,7 @@ typedef enum /*< prefix=CLUTTER_BIND >*/
 *
 * Flags passed to the ‘paint’ or ‘pick’ method of #ClutterEffect.
 */
-typedef enum /*< prefix=CLUTTER_EFFECT_PAINT >*/
-{
+typedef enum { /*< prefix=CLUTTER_EFFECT_PAINT >*/
  CLUTTER_EFFECT_PAINT_ACTOR_DIRTY = (1 << 0)
 } ClutterEffectPaintFlags;

@@ -629,8 +611,7 @@ typedef enum /*< prefix=CLUTTER_EFFECT_PAINT >*/
 *
 * Since: 1.2
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_BOX_ALIGNMENT_START,
  CLUTTER_BOX_ALIGNMENT_END,
  CLUTTER_BOX_ALIGNMENT_CENTER
@@ -647,8 +628,7 @@ typedef enum
 *
 * Since: 1.8
 */
-typedef enum /*< prefix=CLUTTER_LONG_PRESS >*/
-{
+typedef enum { /*< prefix=CLUTTER_LONG_PRESS >*/
  CLUTTER_LONG_PRESS_QUERY,
  CLUTTER_LONG_PRESS_ACTIVATE,
  CLUTTER_LONG_PRESS_CANCEL
@@ -706,8 +686,7 @@ typedef enum /*< prefix=CLUTTER_LONG_PRESS >*/
 *
 * Since: 1.6
 */
-typedef enum /*< prefix=CLUTTER_COLOR >*/
-{
+typedef enum { /*< prefix=CLUTTER_COLOR >*/
  /* CGA/EGA-like palette */
  CLUTTER_COLOR_WHITE           = 0,
  CLUTTER_COLOR_BLACK,
@@ -771,8 +750,7 @@ typedef enum /*< prefix=CLUTTER_COLOR >*/
 *
 * Since: 1.4
 */
-typedef enum /*< prefix=CLUTTER_DRAG >*/
-{
+typedef enum { /*< prefix=CLUTTER_DRAG >*/
  CLUTTER_DRAG_AXIS_NONE = 0,

  CLUTTER_DRAG_X_AXIS,
@@ -789,8 +767,7 @@ typedef enum /*< prefix=CLUTTER_DRAG >*/
 *
 * Since: 0.6
 */
-typedef enum /*< flags prefix=CLUTTER_EVENT >*/
-{
+typedef enum { /*< flags prefix=CLUTTER_EVENT >*/
  CLUTTER_EVENT_NONE              = 0,
  CLUTTER_EVENT_FLAG_SYNTHETIC    = 1 << 0,
  CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1,
@@ -835,8 +812,7 @@ typedef enum /*< flags prefix=CLUTTER_EVENT >*/
 *
 * Since: 0.4
 */
-typedef enum /*< prefix=CLUTTER >*/
-{
+typedef enum { /*< prefix=CLUTTER >*/
  CLUTTER_NOTHING = 0,
  CLUTTER_KEY_PRESS,
  CLUTTER_KEY_RELEASE,
@@ -881,8 +857,7 @@ typedef enum /*< prefix=CLUTTER >*/
 *
 * Since: 0.4
 */
-typedef enum /*< prefix=CLUTTER_SCROLL >*/
-{
+typedef enum { /*< prefix=CLUTTER_SCROLL >*/
  CLUTTER_SCROLL_UP,
  CLUTTER_SCROLL_DOWN,
  CLUTTER_SCROLL_LEFT,
@@ -900,8 +875,7 @@ typedef enum /*< prefix=CLUTTER_SCROLL >*/
 *
 * Since: 0.4
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_STAGE_STATE_FULLSCREEN       = (1 << 1),
  CLUTTER_STAGE_STATE_OFFSCREEN        = (1 << 2),
  CLUTTER_STAGE_STATE_ACTIVATED        = (1 << 3)
@@ -909,6 +883,7 @@ typedef enum

 /**
 * ClutterFeatureFlags:
+ * @CLUTTER_FEATURE_TEXTURE_NPOT: Set if NPOTS textures supported.
 * @CLUTTER_FEATURE_SWAP_THROTTLE: Set if backend throttles buffer swaps.
 * @CLUTTER_FEATURE_TEXTURE_YUV: Set if YUV based textures supported.
 * @CLUTTER_FEATURE_TEXTURE_READ_PIXELS: Set if texture pixels can be read.
@@ -927,6 +902,7 @@ typedef enum
 */
 typedef enum
 {
+  CLUTTER_FEATURE_TEXTURE_NPOT           = (1 << 2),
  CLUTTER_FEATURE_SWAP_THROTTLE          = (1 << 3),
  CLUTTER_FEATURE_TEXTURE_YUV            = (1 << 4),
  CLUTTER_FEATURE_TEXTURE_READ_PIXELS    = (1 << 5),
@@ -951,8 +927,7 @@ typedef enum
 *
 * Since: 1.2
 */
-typedef enum /*< prefix=CLUTTER_FLOW >*/
-{
+typedef enum { /*< prefix=CLUTTER_FLOW >*/
  CLUTTER_FLOW_HORIZONTAL,
  CLUTTER_FLOW_VERTICAL
 } ClutterFlowOrientation;
@@ -979,8 +954,7 @@ typedef enum /*< prefix=CLUTTER_FLOW >*/
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_POINTER_DEVICE,
  CLUTTER_KEYBOARD_DEVICE,
  CLUTTER_EXTENSION_DEVICE,
@@ -1008,8 +982,7 @@ typedef enum
 *
 * Since: 1.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_MODE_MASTER,
  CLUTTER_INPUT_MODE_SLAVE,
  CLUTTER_INPUT_MODE_FLOATING
@@ -1034,8 +1007,7 @@ typedef enum
 *
 * Since: 1.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_AXIS_IGNORE,

  CLUTTER_INPUT_AXIS_X,
@@ -1062,8 +1034,7 @@ typedef enum
 *
 * Since: 1.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SNAP_EDGE_TOP,
  CLUTTER_SNAP_EDGE_RIGHT,
  CLUTTER_SNAP_EDGE_BOTTOM,
@@ -1080,8 +1051,7 @@ typedef enum
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_PICK_NONE = 0,
  CLUTTER_PICK_REACTIVE,
  CLUTTER_PICK_ALL
@@ -1098,8 +1068,7 @@ typedef enum
 *
 * Since: 1.8
 */
-typedef enum /*< prefix=CLUTTER_SWIPE_DIRECTION >*/
-{
+typedef enum { /*< prefix=CLUTTER_SWIPE_DIRECTION >*/
  CLUTTER_SWIPE_DIRECTION_UP    = 1 << 0,
  CLUTTER_SWIPE_DIRECTION_DOWN  = 1 << 1,
  CLUTTER_SWIPE_DIRECTION_LEFT  = 1 << 2,
@@ -1119,8 +1088,7 @@ typedef enum /*< prefix=CLUTTER_SWIPE_DIRECTION >*/
 *
 * Since: 1.12
 */
-typedef enum /*< prefix=CLUTTER_PAN >*/
-{
+typedef enum { /*< prefix=CLUTTER_PAN >*/
  CLUTTER_PAN_AXIS_NONE = 0,

  CLUTTER_PAN_X_AXIS,
@@ -1145,8 +1113,7 @@ typedef enum /*< prefix=CLUTTER_PAN >*/
 *
 * Deprecated: 1.22: Use the alignment properties of #ClutterActor
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TABLE_ALIGNMENT_START,
  CLUTTER_TABLE_ALIGNMENT_CENTER,
  CLUTTER_TABLE_ALIGNMENT_END
@@ -1167,8 +1134,7 @@ typedef enum
 * Deprecated: 1.22: The #ClutterTexture class was the only user of
 *   this API
 */
-typedef enum /*< prefix=CLUTTER_TEXTURE >*/
-{
+typedef enum { /*< prefix=CLUTTER_TEXTURE >*/
  CLUTTER_TEXTURE_NONE             = 0,
  CLUTTER_TEXTURE_RGB_FLAG_BGR     = 1 << 1,
  CLUTTER_TEXTURE_RGB_FLAG_PREMULT = 1 << 2, /* FIXME: not handled */
@@ -1192,8 +1158,7 @@ typedef enum /*< prefix=CLUTTER_TEXTURE >*/
 *   this API; use #ClutterImage and clutter_actor_set_content_scaling_filters()
 *   instead.
 */
-typedef enum /*< prefix=CLUTTER_TEXTURE_QUALITY >*/
-{
+typedef enum { /*< prefix=CLUTTER_TEXTURE_QUALITY >*/
  CLUTTER_TEXTURE_QUALITY_LOW,
  CLUTTER_TEXTURE_QUALITY_MEDIUM,
  CLUTTER_TEXTURE_QUALITY_HIGH
@@ -1208,8 +1173,7 @@ typedef enum /*< prefix=CLUTTER_TEXTURE_QUALITY >*/
 *
 * Since: 0.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TIMELINE_FORWARD,
  CLUTTER_TIMELINE_BACKWARD
 } ClutterTimelineDirection;
@@ -1228,8 +1192,7 @@ typedef enum
 *
 * Since: 1.0
 */
-typedef enum /*< prefix=CLUTTER_UNIT >*/
-{
+typedef enum { /*< prefix=CLUTTER_UNIT >*/
  CLUTTER_UNIT_PIXEL,
  CLUTTER_UNIT_EM,
  CLUTTER_UNIT_MM,
@@ -1259,8 +1222,7 @@ typedef enum /*< prefix=CLUTTER_UNIT >*/
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_PATH_MOVE_TO      = 0,
  CLUTTER_PATH_LINE_TO      = 1,
  CLUTTER_PATH_CURVE_TO     = 2,
@@ -1291,8 +1253,7 @@ typedef enum
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ACTOR_ALIGN_FILL,
  CLUTTER_ACTOR_ALIGN_START,
  CLUTTER_ACTOR_ALIGN_CENTER,
@@ -1312,8 +1273,7 @@ typedef enum
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_REPAINT_FLAGS_PRE_PAINT = 1 << 0,
  CLUTTER_REPAINT_FLAGS_POST_PAINT = 1 << 1,
  CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD = 1 << 2
@@ -1338,8 +1298,7 @@ typedef enum
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_CONTENT_GRAVITY_TOP_LEFT,
  CLUTTER_CONTENT_GRAVITY_TOP,
  CLUTTER_CONTENT_GRAVITY_TOP_RIGHT,
@@ -1369,8 +1328,7 @@ typedef enum
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SCALING_FILTER_LINEAR,
  CLUTTER_SCALING_FILTER_NEAREST,
  CLUTTER_SCALING_FILTER_TRILINEAR
@@ -1385,8 +1343,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ORIENTATION_HORIZONTAL,
  CLUTTER_ORIENTATION_VERTICAL
 } ClutterOrientation;
@@ -1402,8 +1359,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum /*< prefix=CLUTTER_SCROLL >*/
-{
+typedef enum { /*< prefix=CLUTTER_SCROLL >*/
  CLUTTER_SCROLL_NONE         = 0,

  CLUTTER_SCROLL_HORIZONTALLY = 1 << 0,
@@ -1423,8 +1379,7 @@ typedef enum /*< prefix=CLUTTER_SCROLL >*/
 *
 * Since: 1.12
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_GRID_POSITION_LEFT,
  CLUTTER_GRID_POSITION_RIGHT,
  CLUTTER_GRID_POSITION_TOP,
@@ -1442,8 +1397,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_REPEAT_NONE   = 0,
  CLUTTER_REPEAT_X_AXIS = 1 << 0,
  CLUTTER_REPEAT_Y_AXIS = 1 << 1,
@@ -1465,8 +1419,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_STEP_MODE_START,
  CLUTTER_STEP_MODE_END
 } ClutterStepMode;
@@ -1482,8 +1435,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum /*< prefix=CLUTTER_ZOOM >*/
-{
+typedef enum { /*< prefix=CLUTTER_ZOOM >*/
  CLUTTER_ZOOM_X_AXIS,
  CLUTTER_ZOOM_Y_AXIS,
  CLUTTER_ZOOM_BOTH
@@ -1506,8 +1458,7 @@ typedef enum /*< prefix=CLUTTER_ZOOM >*/
 *
 * Since: 1.18
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_GESTURE_TRIGGER_EDGE_NONE  = 0,
  CLUTTER_GESTURE_TRIGGER_EDGE_AFTER,
  CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE
@@ -1543,8 +1494,7 @@ typedef enum
 *
 * Since: 1.24
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TOUCHPAD_GESTURE_PHASE_BEGIN,
  CLUTTER_TOUCHPAD_GESTURE_PHASE_UPDATE,
  CLUTTER_TOUCHPAD_GESTURE_PHASE_END,
@@ -1566,8 +1516,7 @@ typedef enum
 *
 * Since: 1.26
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SCROLL_SOURCE_UNKNOWN,
  CLUTTER_SCROLL_SOURCE_WHEEL,
  CLUTTER_SCROLL_SOURCE_FINGER,
@@ -1585,8 +1534,7 @@ typedef enum
 *
 * Since: 1.26
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SCROLL_FINISHED_NONE       = 0,
  CLUTTER_SCROLL_FINISHED_HORIZONTAL = 1 << 0,
  CLUTTER_SCROLL_FINISHED_VERTICAL   = 1 << 1
@@ -1607,8 +1555,7 @@ typedef enum
 *
 * Since: 1.28
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_DEVICE_TOOL_NONE,
  CLUTTER_INPUT_DEVICE_TOOL_PEN,
  CLUTTER_INPUT_DEVICE_TOOL_ERASER,
@@ -1619,20 +1566,17 @@ typedef enum
  CLUTTER_INPUT_DEVICE_TOOL_LENS
 } ClutterInputDeviceToolType;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_DEVICE_PAD_SOURCE_UNKNOWN,
  CLUTTER_INPUT_DEVICE_PAD_SOURCE_FINGER,
 } ClutterInputDevicePadSource;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE,
  CLUTTER_INPUT_DEVICE_MAPPING_RELATIVE,
 } ClutterInputDeviceMapping;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_CONTENT_HINT_COMPLETION          = 1 << 0,
  CLUTTER_INPUT_CONTENT_HINT_SPELLCHECK          = 1 << 1,
  CLUTTER_INPUT_CONTENT_HINT_AUTO_CAPITALIZATION = 1 << 2,
@@ -1645,8 +1589,7 @@ typedef enum
  CLUTTER_INPUT_CONTENT_HINT_MULTILINE           = 1 << 9,
 } ClutterInputContentHintFlags;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_CONTENT_PURPOSE_NORMAL,
  CLUTTER_INPUT_CONTENT_PURPOSE_ALPHA,
  CLUTTER_INPUT_CONTENT_PURPOSE_DIGITS,
@@ -1662,8 +1605,7 @@ typedef enum
  CLUTTER_INPUT_CONTENT_PURPOSE_TERMINAL,
 } ClutterInputContentPurpose;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_PANEL_STATE_OFF,
  CLUTTER_INPUT_PANEL_STATE_ON,
  CLUTTER_INPUT_PANEL_STATE_TOGGLE,
--- a/clutter/clutter/clutter-event-translator.h
+++ b/clutter/clutter/clutter-event-translator.h
@@ -14,8 +14,7 @@ G_BEGIN_DECLS
 typedef struct _ClutterEventTranslator          ClutterEventTranslator;
 typedef struct _ClutterEventTranslatorIface     ClutterEventTranslatorIface;

-typedef enum
-{
+typedef enum {
  CLUTTER_TRANSLATE_CONTINUE,
  CLUTTER_TRANSLATE_REMOVE,
  CLUTTER_TRANSLATE_QUEUE
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@@ -1021,9 +1021,6 @@ clutter_event_get_event_sequence (const ClutterEvent *event)
      event->type == CLUTTER_TOUCH_END ||
      event->type == CLUTTER_TOUCH_CANCEL)
    return event->touch.sequence;
-  else if (event->type == CLUTTER_ENTER ||
-           event->type == CLUTTER_LEAVE)
-    return event->crossing.sequence;

  return NULL;
 }
--- a/clutter/clutter/clutter-event.h
+++ b/clutter/clutter/clutter-event.h
@@ -269,7 +269,6 @@ struct _ClutterCrossingEvent
  gfloat x;
  gfloat y;
  ClutterInputDevice *device;
-  ClutterEventSequence *sequence;
  ClutterActor *related;
 };

--- a/clutter/clutter/clutter-feature.c
+++ b/clutter/clutter/clutter-feature.c
@@ -64,13 +64,17 @@ clutter_features_from_cogl (guint cogl_flags)
 {
  ClutterFeatureFlags clutter_flags = 0;
  
+  if (cogl_flags & COGL_FEATURE_TEXTURE_NPOT)
+    clutter_flags |= CLUTTER_FEATURE_TEXTURE_NPOT;
+
  if (cogl_flags & COGL_FEATURE_TEXTURE_YUV)
    clutter_flags |= CLUTTER_FEATURE_TEXTURE_YUV;
  
  if (cogl_flags & COGL_FEATURE_TEXTURE_READ_PIXELS)
    clutter_flags |= CLUTTER_FEATURE_TEXTURE_READ_PIXELS;
  
-  clutter_flags |= CLUTTER_FEATURE_SHADERS_GLSL;
+  if (cogl_flags & COGL_FEATURE_SHADERS_GLSL)
+    clutter_flags |= CLUTTER_FEATURE_SHADERS_GLSL;
  
  if (cogl_flags & COGL_FEATURE_OFFSCREEN)
    clutter_flags |= CLUTTER_FEATURE_OFFSCREEN;
--- a/clutter/clutter/clutter-image.h
+++ b/clutter/clutter/clutter-image.h
@@ -63,8 +63,7 @@ typedef struct _ClutterImageClass      ClutterImageClass;
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_IMAGE_ERROR_INVALID_DATA
 } ClutterImageError;

--- a/clutter/clutter/clutter-input-device-tool.c
+++ b/clutter/clutter/clutter-input-device-tool.c
@@ -35,8 +35,7 @@ struct _ClutterInputDeviceToolPrivate
  guint64 id;
 };

-enum
-{
+enum {
  PROP_0,
  PROP_TYPE,
  PROP_SERIAL,
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -834,7 +834,6 @@ _clutter_input_device_set_actor (ClutterInputDevice   *device,
          event->crossing.x = device->current_x;
          event->crossing.y = device->current_y;
          event->crossing.related = actor;
-          event->crossing.sequence = sequence;
          clutter_event_set_device (event, device);

          /* we need to make sure that this event is processed
@@ -871,7 +870,6 @@ _clutter_input_device_set_actor (ClutterInputDevice   *device,
          event->crossing.y = device->current_y;
          event->crossing.source = actor;
          event->crossing.related = old_actor;
-          event->crossing.sequence = sequence;
          clutter_event_set_device (event, device);

          /* see above */
@@ -1036,10 +1034,9 @@ _clutter_input_device_update (ClutterInputDevice   *device,
  ClutterActor *new_cursor_actor;
  ClutterActor *old_cursor_actor;
  ClutterPoint point = { -1, -1 };
-  ClutterInputDeviceType device_type = device->device_type;

-  g_assert (device_type != CLUTTER_KEYBOARD_DEVICE &&
-            device_type != CLUTTER_PAD_DEVICE);
+  if (device->device_type == CLUTTER_KEYBOARD_DEVICE)
+    return NULL;

  stage = device->stage;
  if (G_UNLIKELY (stage == NULL))
@@ -2287,3 +2284,15 @@ clutter_input_device_is_grouped (ClutterInputDevice *device,

  return CLUTTER_INPUT_DEVICE_GET_CLASS (device)->is_grouped (device, other_device);
 }
+
+gboolean
+clutter_input_device_get_physical_size (ClutterInputDevice *device,
+                                        gdouble            *width,
+                                        gdouble            *height)
+{
+  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), FALSE);
+
+  return CLUTTER_INPUT_DEVICE_GET_CLASS (device)->get_physical_size (device,
+                                                                     width,
+                                                                     height);
+}
--- a/clutter/clutter/clutter-input-device.h
+++ b/clutter/clutter/clutter-input-device.h
@@ -171,6 +171,10 @@ void                      clutter_input_device_set_mapping_mode (ClutterInputDev
 CLUTTER_EXPORT
 gboolean                  clutter_input_device_is_grouped       (ClutterInputDevice *device,
                                                                 ClutterInputDevice *other_device);
+CLUTTER_EXPORT
+gboolean                  clutter_input_device_get_physical_size (ClutterInputDevice *device,
+								  gdouble            *width,
+								  gdouble            *height);

 G_END_DECLS

--- a/clutter/clutter/clutter-input-focus.c
+++ b/clutter/clutter/clutter-input-focus.c
@@ -175,8 +175,7 @@ clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
 }

 void
-clutter_input_focus_set_input_panel_state (ClutterInputFocus      *focus,
-                                           ClutterInputPanelState  state)
+clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus)
 {
  ClutterInputFocusPrivate *priv;

@@ -185,7 +184,7 @@ clutter_input_focus_set_input_panel_state (ClutterInputFocus      *focus,

  priv = clutter_input_focus_get_instance_private (focus);

-  clutter_input_method_set_input_panel_state (priv->im, state);
+  clutter_input_method_toggle_input_panel (priv->im);
 }

 void
--- a/clutter/clutter/clutter-input-focus.h
+++ b/clutter/clutter/clutter-input-focus.h
@@ -78,7 +78,6 @@ CLUTTER_EXPORT
 void clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
                                               gboolean           can_show_preedit);
 CLUTTER_EXPORT
-void clutter_input_focus_set_input_panel_state (ClutterInputFocus      *focus,
-                                                ClutterInputPanelState  state);
+void clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus);

 #endif /* __CLUTTER_INPUT_FOCUS_H__ */
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@@ -37,8 +37,7 @@ struct _ClutterInputMethodPrivate
  gboolean can_show_preedit;
 };

-enum
-{
+enum {
  COMMIT,
  DELETE_SURROUNDING,
  REQUEST_SURROUNDING,
@@ -47,8 +46,7 @@ enum
  N_SIGNALS,
 };

-enum
-{
+enum {
  PROP_0,
  PROP_CONTENT_HINTS,
  PROP_CONTENT_PURPOSE,
@@ -266,6 +264,9 @@ clutter_input_method_focus_out (ClutterInputMethod *im)

  klass = CLUTTER_INPUT_METHOD_GET_CLASS (im);
  klass->focus_out (im);
+
+  g_signal_emit (im, signals[INPUT_PANEL_STATE],
+                 0, CLUTTER_INPUT_PANEL_STATE_OFF);
 }

 ClutterInputFocus *
@@ -360,12 +361,12 @@ clutter_input_method_notify_key_event (ClutterInputMethod *im,
 }

 void
-clutter_input_method_set_input_panel_state (ClutterInputMethod     *im,
-                                            ClutterInputPanelState  state)
+clutter_input_method_toggle_input_panel (ClutterInputMethod *im)
 {
  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));

-  g_signal_emit (im, signals[INPUT_PANEL_STATE], 0, state);
+  g_signal_emit (im, signals[INPUT_PANEL_STATE], 0,
+                 CLUTTER_INPUT_PANEL_STATE_TOGGLE);
 }

 void
--- a/clutter/clutter/clutter-input-method.h
+++ b/clutter/clutter/clutter-input-method.h
@@ -83,8 +83,7 @@ void clutter_input_method_notify_key_event (ClutterInputMethod *im,
                                            const ClutterEvent *event,
                                            gboolean            filtered);
 CLUTTER_EXPORT
-void clutter_input_method_set_input_panel_state (ClutterInputMethod     *im,
-                                                 ClutterInputPanelState  state);
+void clutter_input_method_request_toggle_input_panel (ClutterInputMethod *im);

 CLUTTER_EXPORT
 void clutter_input_method_forward_key (ClutterInputMethod *im,
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -193,6 +193,17 @@ clutter_config_read_from_key_file (GKeyFile *keyfile)
  if (!g_key_file_has_group (keyfile, ENVIRONMENT_GROUP))
    return;

+  str_value =
+    g_key_file_get_string (keyfile, ENVIRONMENT_GROUP,
+                           "Backends",
+                           &key_error);
+  if (key_error != NULL)
+    g_clear_error (&key_error);
+  else
+    clutter_try_set_windowing_backend (str_value);
+
+  g_free (str_value);
+
  str_value =
    g_key_file_get_string (keyfile, ENVIRONMENT_GROUP,
                           "Drivers",
@@ -2004,36 +2015,6 @@ emit_pointer_event (ClutterEvent       *event,
    }
 }

-static inline void
-emit_crossing_event (ClutterEvent       *event,
-                     ClutterInputDevice *device)
-{
-  ClutterMainContext *context = _clutter_context_get_default ();
-  ClutterEventSequence *sequence = clutter_event_get_event_sequence (event);
-  ClutterActor *grab_actor = NULL;
-
-  if (_clutter_event_process_filters (event))
-    return;
-
-  if (sequence)
-    {
-      if (device->sequence_grab_actors != NULL)
-        grab_actor = g_hash_table_lookup (device->sequence_grab_actors, sequence);
-    }
-  else
-    {
-      if (context->pointer_grab_actor != NULL)
-        grab_actor = context->pointer_grab_actor;
-      else if (device != NULL && device->pointer_grab_actor != NULL)
-        grab_actor = device->pointer_grab_actor;
-    }
-
-  if (grab_actor != NULL)
-    clutter_actor_event (grab_actor, event, FALSE);
-  else
-    emit_event_chain (event);
-}
-
 static inline void
 emit_touch_event (ClutterEvent       *event,
                  ClutterInputDevice *device)
@@ -2207,7 +2188,7 @@ _clutter_process_event_details (ClutterActor        *stage,
          {
            ClutterActor *actor = NULL;

-            emit_crossing_event (event, device);
+            emit_pointer_event (event, device);

            actor = _clutter_input_device_update (device, NULL, FALSE);
            if (actor != stage)
@@ -2219,12 +2200,12 @@ _clutter_process_event_details (ClutterActor        *stage,
                crossing->crossing.related = stage;
                crossing->crossing.source = actor;

-                emit_crossing_event (crossing, device);
+                emit_pointer_event (crossing, device);
                clutter_event_free (crossing);
              }
          }
        else
-          emit_crossing_event (event, device);
+          emit_pointer_event (event, device);
        break;

      case CLUTTER_LEAVE:
@@ -2243,10 +2224,10 @@ _clutter_process_event_details (ClutterActor        *stage,
            crossing->crossing.related = stage;
            crossing->crossing.source = device->cursor_actor;

-            emit_crossing_event (crossing, device);
+            emit_pointer_event (crossing, device);
            clutter_event_free (crossing);
          }
-        emit_crossing_event (event, device);
+        emit_pointer_event (event, device);
        break;

      case CLUTTER_DESTROY_NOTIFY:
--- a/clutter/clutter/clutter-main.h
+++ b/clutter/clutter/clutter-main.h
@@ -53,8 +53,7 @@ G_BEGIN_DECLS
 *
 * Since: 0.2
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INIT_SUCCESS        =  1,
  CLUTTER_INIT_ERROR_UNKNOWN  =  0,
  CLUTTER_INIT_ERROR_THREADS  = -1,
--- a/clutter/clutter/clutter-master-clock-default.c
+++ b/clutter/clutter/clutter-master-clock-default.c
@@ -412,7 +412,8 @@ master_clock_advance_timelines (ClutterMasterClockDefault *master_clock)
  for (l = timelines; l != NULL; l = l->next)
    _clutter_timeline_do_tick (l->data, master_clock->cur_tick / 1000);

-  g_slist_free_full (timelines, g_object_unref);
+  g_slist_foreach (timelines, (GFunc) g_object_unref, NULL);
+  g_slist_free (timelines);

 #ifdef CLUTTER_ENABLE_DEBUG
  if (_clutter_diagnostic_enabled ())
@@ -573,7 +574,8 @@ clutter_clock_dispatch (GSource     *source,

  master_clock_reschedule_stage_updates (master_clock, stages);

-  g_slist_free_full (stages, g_object_unref);
+  g_slist_foreach (stages, (GFunc) g_object_unref, NULL);
+  g_slist_free (stages);

  master_clock->prev_tick = master_clock->cur_tick;

--- a/clutter/clutter/clutter-mutter.h
+++ b/clutter/clutter/clutter-mutter.h
@@ -49,9 +49,6 @@ void clutter_stage_freeze_updates (ClutterStage *stage);
 CLUTTER_EXPORT
 void clutter_stage_thaw_updates (ClutterStage *stage);

-CLUTTER_EXPORT
-void clutter_stage_update_resource_scales (ClutterStage *stage);
-
 CLUTTER_EXPORT
 gboolean clutter_actor_has_damage (ClutterActor *actor);

--- a/clutter/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter/clutter-offscreen-effect.c
@@ -66,8 +66,6 @@

 #include "clutter-offscreen-effect.h"

-#include <math.h>
-
 #include "cogl/cogl.h"

 #include "clutter-actor-private.h"
@@ -95,8 +93,8 @@ struct _ClutterOffscreenEffectPrivate
     through create_texture(). This needs to be tracked separately so
     that we can detect when a different size is calculated and
     regenerate the fbo */
-  int target_width;
-  int target_height;
+  int fbo_width;
+  int fbo_height;

  gint old_opacity_override;
 };
@@ -137,35 +135,8 @@ clutter_offscreen_effect_real_create_texture (ClutterOffscreenEffect *effect,
                                     COGL_PIXEL_FORMAT_RGBA_8888_PRE);
 }

-static void
-ensure_pipeline_filter_for_scale (ClutterOffscreenEffect *self,
-                                  float                   resource_scale)
-{
-  CoglPipelineFilter filter;
-
-  if (!self->priv->target)
-    return;
-
-  /* If no fractional scaling is set, we're always going to render the texture
-     at a 1:1 texel:pixel ratio so, in such case we can use 'nearest' filtering
-     to decrease the effects of rounding errors in the geometry calculation;
-     if instead we we're using a global fractional scaling we need to make sure
-     that we're using the default linear effect, not to create artifacts when
-     scaling down the texture */
-  if (fmodf (resource_scale, 1.0f) == 0)
-    filter = COGL_PIPELINE_FILTER_NEAREST;
-  else
-    filter = COGL_PIPELINE_FILTER_LINEAR;
-
-  cogl_pipeline_set_layer_filters (self->priv->target, 0 /* layer_index */,
-                                   filter, filter);
-}
-
 static gboolean
-update_fbo (ClutterEffect *effect,
-            int            target_width,
-            int            target_height,
-            float          resource_scale)
+update_fbo (ClutterEffect *effect, int fbo_width, int fbo_height)
 {
  ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (effect);
  ClutterOffscreenEffectPrivate *priv = self->priv;
@@ -180,13 +151,10 @@ update_fbo (ClutterEffect *effect,
      return FALSE;
    }

-  if (priv->target_width == target_width &&
-      priv->target_height == target_height &&
+  if (priv->fbo_width == fbo_width &&
+      priv->fbo_height == fbo_height &&
      priv->offscreen != NULL)
-  {
-    ensure_pipeline_filter_for_scale (self, resource_scale);
    return TRUE;
-  }

  if (priv->target == NULL)
    {
@@ -194,7 +162,14 @@ update_fbo (ClutterEffect *effect,
        clutter_backend_get_cogl_context (clutter_get_default_backend ());

      priv->target = cogl_pipeline_new (ctx);
-      ensure_pipeline_filter_for_scale (self, resource_scale);
+
+      /* We're always going to render the texture at a 1:1 texel:pixel
+         ratio so we can use 'nearest' filtering to decrease the
+         effects of rounding errors in the geometry calculation */
+      cogl_pipeline_set_layer_filters (priv->target,
+                                       0, /* layer_index */
+                                       COGL_PIPELINE_FILTER_NEAREST,
+                                       COGL_PIPELINE_FILTER_NEAREST);
    }

  if (priv->texture != NULL)
@@ -210,14 +185,14 @@ update_fbo (ClutterEffect *effect,
    }

  priv->texture =
-    clutter_offscreen_effect_create_texture (self, target_width, target_height);
+    clutter_offscreen_effect_create_texture (self, fbo_width, fbo_height);
  if (priv->texture == NULL)
    return FALSE;

  cogl_pipeline_set_layer_texture (priv->target, 0, priv->texture);

-  priv->target_width = target_width;
-  priv->target_height = target_height;
+  priv->fbo_width = fbo_width;
+  priv->fbo_height = fbo_height;

  priv->offscreen = cogl_offscreen_new_to_texture (priv->texture);
  if (priv->offscreen == NULL)
@@ -227,8 +202,8 @@ update_fbo (ClutterEffect *effect,
      cogl_handle_unref (priv->target);
      priv->target = NULL;

-      priv->target_width = 0;
-      priv->target_height = 0;
+      priv->fbo_width = 0;
+      priv->fbo_height = 0;

      return FALSE;
    }
@@ -247,9 +222,7 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  const ClutterPaintVolume *volume;
  CoglColor transparent;
  gfloat stage_width, stage_height;
-  gfloat target_width = -1, target_height = -1;
-  gfloat resource_scale;
-  gfloat ceiled_resource_scale;
+  gfloat fbo_width = -1, fbo_height = -1;
  ClutterVertex local_offset = { 0.f, 0.f, 0.f };
  gfloat old_viewport[4];

@@ -262,18 +235,6 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  stage = _clutter_actor_get_stage_internal (priv->actor);
  clutter_actor_get_size (stage, &stage_width, &stage_height);

-  if (_clutter_actor_get_real_resource_scale (priv->actor, &resource_scale))
-    {
-      ceiled_resource_scale = ceilf (resource_scale);
-      stage_width *= ceiled_resource_scale;
-      stage_height *= ceiled_resource_scale;
-    }
-  else
-    {
-      /* We are sure we have a resource scale set to a good value at paint */
-      g_assert_not_reached ();
-    }
-
  /* Get the minimal bounding box for what we want to paint, relative to the
   * parent of priv->actor. Note that we may actually be painting a clone of
   * priv->actor so we need to be careful to avoid querying the transformation
@@ -300,14 +261,10 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  priv->fbo_offset_x = box.x1 - raw_box.x1;
  priv->fbo_offset_y = box.y1 - raw_box.y1;

-  clutter_actor_box_scale (&box, ceiled_resource_scale);
-  clutter_actor_box_get_size (&box, &target_width, &target_height);
-
-  target_width = ceilf (target_width);
-  target_height = ceilf (target_height);
+  clutter_actor_box_get_size (&box, &fbo_width, &fbo_height);

  /* First assert that the framebuffer is the right size... */
-  if (!update_fbo (effect, target_width, target_height, resource_scale))
+  if (!update_fbo (effect, fbo_width, fbo_height))
    return FALSE;

  cogl_get_modelview_matrix (&old_modelview);
@@ -409,7 +366,6 @@ clutter_offscreen_effect_paint_texture (ClutterOffscreenEffect *effect)
 {
  ClutterOffscreenEffectPrivate *priv = effect->priv;
  CoglMatrix modelview;
-  float resource_scale;

  cogl_push_matrix ();

@@ -417,14 +373,6 @@ clutter_offscreen_effect_paint_texture (ClutterOffscreenEffect *effect)
   * missing a correction for the expanded FBO and offset rendering within...
   */
  cogl_get_modelview_matrix (&modelview);
-
-  if (clutter_actor_get_resource_scale (priv->actor, &resource_scale) &&
-      resource_scale != 1.0f)
-    {
-      float paint_scale = 1.0f / resource_scale;
-      cogl_matrix_scale (&modelview, paint_scale, paint_scale, 1);
-    }
-
  cogl_matrix_translate (&modelview,
                         priv->fbo_offset_x,
                         priv->fbo_offset_y,
--- a/clutter/clutter/clutter-paint-node-private.h
+++ b/clutter/clutter/clutter-paint-node-private.h
@@ -74,8 +74,7 @@ struct _ClutterPaintNodeClass

 #define PAINT_OP_INIT   { PAINT_OP_INVALID }

-typedef enum
-{
+typedef enum {
  PAINT_OP_INVALID = 0,
  PAINT_OP_TEX_RECT,
  PAINT_OP_MULTITEX_RECT,
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -75,7 +75,8 @@ _clutter_paint_node_init_types (void)
  cogl_pipeline_set_color (default_color_pipeline, &cogl_color);

  default_texture_pipeline = cogl_pipeline_new (ctx);
-  cogl_pipeline_set_layer_null_texture (default_texture_pipeline, 0);
+  cogl_pipeline_set_layer_null_texture (default_texture_pipeline, 0,
+                                        COGL_TEXTURE_TYPE_2D);
  cogl_pipeline_set_color (default_texture_pipeline, &cogl_color);
  cogl_pipeline_set_layer_wrap_mode (default_texture_pipeline, 0,
                                     COGL_PIPELINE_WRAP_MODE_AUTOMATIC);
--- a/clutter/clutter/clutter-path.c
+++ b/clutter/clutter/clutter-path.c
@@ -295,7 +295,8 @@ clutter_path_clear (ClutterPath *path)
 {
  ClutterPathPrivate *priv = path->priv;

-  g_slist_free_full (priv->nodes, (GDestroyNotify) clutter_path_node_full_free);
+  g_slist_foreach (priv->nodes, (GFunc) clutter_path_node_full_free, NULL);
+  g_slist_free (priv->nodes);

  priv->nodes = priv->nodes_tail = NULL;
  priv->nodes_dirty = TRUE;
@@ -658,7 +659,8 @@ clutter_path_parse_description (const gchar  *p,
  return TRUE;

 fail:
-  g_slist_free_full (nodes, (GDestroyNotify) clutter_path_node_full_free);
+  g_slist_foreach (nodes, (GFunc) clutter_path_node_full_free, NULL);
+  g_slist_free (nodes);
  return FALSE;
 }

--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -69,9 +69,6 @@ typedef struct _ClutterVertex4          ClutterVertex4;
 #define CLUTTER_ACTOR_IN_REPARENT(a)            ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_REPARENT) != FALSE)
 #define CLUTTER_ACTOR_IN_PAINT(a)               ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PAINT) != FALSE)
 #define CLUTTER_ACTOR_IN_RELAYOUT(a)            ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RELAYOUT) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_WIDTH(a)          ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PREF_WIDTH) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_HEIGHT(a)         ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PREF_HEIGHT) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_SIZE(a)           ((CLUTTER_PRIVATE_FLAGS (a) & (CLUTTER_IN_PREF_HEIGHT|CLUTTER_IN_PREF_WIDTH)) != FALSE)

 #define CLUTTER_PARAM_READABLE  (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)
 #define CLUTTER_PARAM_WRITABLE  (G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)
@@ -94,24 +91,21 @@ typedef struct _ClutterVertex4          ClutterVertex4;
 * because it will break for negative numbers. */
 #define CLUTTER_NEARBYINT(x) ((int) ((x) < 0.0f ? (x) - 0.5f : (x) + 0.5f))

-typedef enum
-{
+typedef enum {
  CLUTTER_ACTOR_UNUSED_FLAG = 0,

  CLUTTER_IN_DESTRUCTION = 1 << 0,
  CLUTTER_IS_TOPLEVEL    = 1 << 1,
  CLUTTER_IN_REPARENT    = 1 << 2,
-  CLUTTER_IN_PREF_WIDTH  = 1 << 3,
-  CLUTTER_IN_PREF_HEIGHT = 1 << 4,

  /* Used to avoid recursion */
-  CLUTTER_IN_PAINT       = 1 << 5,
+  CLUTTER_IN_PAINT       = 1 << 3,

  /* Used to avoid recursion */
-  CLUTTER_IN_RELAYOUT    = 1 << 6,
+  CLUTTER_IN_RELAYOUT    = 1 << 4,

  /* a flag for internal children of Containers (DEPRECATED) */
-  CLUTTER_INTERNAL_CHILD = 1 << 7
+  CLUTTER_INTERNAL_CHILD = 1 << 5
 } ClutterPrivateFlags;

 /*
@@ -246,17 +240,6 @@ void  _clutter_util_fully_transform_vertices (const CoglMatrix    *modelview,
                                              ClutterVertex       *vertices_out,
                                              int                  n_vertices);

-void _clutter_util_rect_from_rectangle (const cairo_rectangle_int_t *src,
-                                        ClutterRect                 *dest);
-
-void _clutter_util_rectangle_int_extents (const ClutterRect     *src,
-                                          cairo_rectangle_int_t *dest);
-
-void _clutter_util_rectangle_offset (const cairo_rectangle_int_t *src,
-                                     int                          x,
-                                     int                          y,
-                                     cairo_rectangle_int_t       *dest);
-
 void _clutter_util_rectangle_union (const cairo_rectangle_int_t *src1,
                                    const cairo_rectangle_int_t *src2,
                                    cairo_rectangle_int_t       *dest);
@@ -303,11 +286,6 @@ gboolean        _clutter_util_matrix_decompose  (const ClutterMatrix *src,
                                                 ClutterVertex       *translate_p,
                                                 ClutterVertex4      *perspective_p);

-PangoDirection _clutter_pango_unichar_direction (gunichar ch);
-
-PangoDirection _clutter_pango_find_base_dir     (const gchar *text,
-                                                 gint         length);
-
 typedef struct _ClutterPlane
 {
  float v0[3];
--- a/clutter/clutter/clutter-script-parser.c
+++ b/clutter/clutter/clutter-script-parser.c
@@ -2021,7 +2021,8 @@ add_children (ClutterScript *script,
      clutter_container_add_actor (container, CLUTTER_ACTOR (object));
    }

-  g_list_free_full (oinfo->children, g_free);
+  g_list_foreach (oinfo->children, (GFunc) g_free, NULL);
+  g_list_free (oinfo->children);

  oinfo->children = unresolved;
 }
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@@ -346,12 +346,15 @@ object_info_free (gpointer data)
      g_free (oinfo->class_name);
      g_free (oinfo->type_func);

-      g_list_free_full (oinfo->properties, property_info_free);
+      g_list_foreach (oinfo->properties, (GFunc) property_info_free, NULL);
+      g_list_free (oinfo->properties);

-      g_list_free_full (oinfo->signals, signal_info_free);
+      g_list_foreach (oinfo->signals, (GFunc) signal_info_free, NULL);
+      g_list_free (oinfo->signals);

      /* these are ids */
-      g_list_free_full (oinfo->children, g_free);
+      g_list_foreach (oinfo->children, (GFunc) g_free, NULL);
+      g_list_free (oinfo->children);

      /* we unref top-level objects and leave the actors alone,
       * unless we are unmerging in which case we have to destroy
@@ -843,7 +846,8 @@ clutter_script_unmerge_objects (ClutterScript *script,
  for (l = data.ids; l != NULL; l = l->next)
    g_hash_table_remove (priv->objects, l->data);

-  g_slist_free_full (data.ids, g_free);
+  g_slist_foreach (data.ids, (GFunc) g_free, NULL);
+  g_slist_free (data.ids);

  clutter_script_ensure_objects (script);
 }
--- a/clutter/clutter/clutter-script.h
+++ b/clutter/clutter/clutter-script.h
@@ -79,8 +79,7 @@ typedef void (* ClutterScriptConnectFunc) (ClutterScript *script,
 *
 * Since: 0.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SCRIPT_ERROR_INVALID_TYPE_FUNCTION,
  CLUTTER_SCRIPT_ERROR_INVALID_PROPERTY,
  CLUTTER_SCRIPT_ERROR_INVALID_VALUE
--- a/clutter/clutter/clutter-stage-manager.c
+++ b/clutter/clutter/clutter-stage-manager.c
@@ -89,8 +89,8 @@ clutter_stage_manager_dispose (GObject *gobject)

  stage_manager = CLUTTER_STAGE_MANAGER (gobject);

-  g_slist_free_full (stage_manager->stages,
-                     (GDestroyNotify) clutter_actor_destroy);
+  g_slist_foreach (stage_manager->stages, (GFunc) clutter_actor_destroy, NULL);
+  g_slist_free (stage_manager->stages);
  stage_manager->stages = NULL;

  G_OBJECT_CLASS (clutter_stage_manager_parent_class)->dispose (gobject);
--- a/clutter/clutter/clutter-stage-private.h
+++ b/clutter/clutter/clutter-stage-private.h
@@ -124,16 +124,11 @@ gboolean                _clutter_stage_update_state     (ClutterStage      *stag

 void                    _clutter_stage_set_scale_factor (ClutterStage      *stage,
                                                         int                factor);
-gboolean                _clutter_stage_get_max_view_scale_factor_for_rect (ClutterStage *stage,
-                                                                           ClutterRect  *rect,
-                                                                           float        *view_scale);

 void            _clutter_stage_presented                (ClutterStage      *stage,
                                                         CoglFrameEvent     frame_event,
                                                         ClutterFrameInfo  *frame_info);

-GList *         _clutter_stage_peek_stage_views         (ClutterStage *stage);
-
 G_END_DECLS

 #endif /* __CLUTTER_STAGE_PRIVATE_H__ */
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -87,8 +87,7 @@
 *
 * A series of hints that enable or disable behaviours on the stage
 */
-typedef enum /*< prefix=CLUTTER_STAGE >*/
-{
+typedef enum { /*< prefix=CLUTTER_STAGE >*/
  CLUTTER_STAGE_HINT_NONE = 0,

  CLUTTER_STAGE_NO_CLEAR_ON_PAINT = 1 << 0
@@ -202,12 +201,6 @@ static const ClutterColor default_stage_color = { 255, 255, 255, 255 };

 static void clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage);
 static void free_queue_redraw_entry (ClutterStageQueueRedrawEntry *entry);
-static void capture_view_into (ClutterStage          *stage,
-                               gboolean               paint,
-                               ClutterStageView      *view,
-                               cairo_rectangle_int_t *rect,
-                               uint8_t               *data,
-                               int                    stride);

 static void clutter_container_iface_init (ClutterContainerIface *iface);

@@ -1303,8 +1296,14 @@ clutter_stage_real_queue_redraw (ClutterActor       *actor,
    return TRUE;

  if (_clutter_stage_window_ignoring_redraw_clips (stage_window))
-    return FALSE;
+    {
+      _clutter_stage_window_add_redraw_clip (stage_window, NULL);
+      return FALSE;
+    }

+  /* Convert the clip volume into stage coordinates and then into an
+   * axis aligned stage coordinates bounding box...
+   */
  if (redraw_clip == NULL)
    {
      _clutter_stage_window_add_redraw_clip (stage_window, NULL);
@@ -1314,8 +1313,6 @@ clutter_stage_real_queue_redraw (ClutterActor       *actor,
  if (redraw_clip->is_empty)
    return TRUE;

-  /* Convert the clip volume into stage coordinates and then into an
-   * axis aligned stage coordinates bounding box... */
  _clutter_paint_volume_get_stage_paint_box (redraw_clip,
                                             stage,
                                             &bounding_box);
@@ -2940,9 +2937,6 @@ clutter_stage_read_pixels (ClutterStage *stage,
  cairo_region_t *clip;
  cairo_rectangle_int_t clip_rect;
  CoglFramebuffer *framebuffer;
-  float view_scale;
-  float pixel_width;
-  float pixel_height;
  uint8_t *pixels;

  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
@@ -2985,15 +2979,10 @@ clutter_stage_read_pixels (ClutterStage *stage,
  cogl_push_framebuffer (framebuffer);
  clutter_stage_do_paint_view (stage, view, &clip_rect);

-  view_scale = clutter_stage_view_get_scale (view);
-  pixel_width = roundf (clip_rect.width * view_scale);
-  pixel_height = roundf (clip_rect.height * view_scale);
-
-  pixels = g_malloc0 (pixel_width * pixel_height * 4);
+  pixels = g_malloc0 (clip_rect.width * clip_rect.height * 4);
  cogl_framebuffer_read_pixels (framebuffer,
-                                clip_rect.x * view_scale,
-                                clip_rect.y * view_scale,
-                                pixel_width, pixel_height,
+                                clip_rect.x, clip_rect.y,
+                                clip_rect.width, clip_rect.height,
                                COGL_PIXEL_FORMAT_RGBA_8888,
                                pixels);

@@ -4767,33 +4756,62 @@ static void
 capture_view (ClutterStage          *stage,
              gboolean               paint,
              ClutterStageView      *view,
+              cairo_rectangle_int_t *rect,
              ClutterCapture        *capture)
 {
+  CoglFramebuffer *framebuffer;
+  ClutterBackend *backend;
+  CoglContext *context;
  cairo_surface_t *image;
  uint8_t *data;
  int stride;
-  cairo_rectangle_int_t *rect;
+  CoglBitmap *bitmap;
+  cairo_rectangle_int_t view_layout;
  float view_scale;
-  float texture_width;
-  float texture_height;

-  rect = &capture->rect;
+  framebuffer = clutter_stage_view_get_framebuffer (view);
+
+  if (paint)
+    {
+      cogl_push_framebuffer (framebuffer);
+      _clutter_stage_maybe_setup_viewport (stage, view);
+      clutter_stage_do_paint_view (stage, view, rect);
+    }

  view_scale = clutter_stage_view_get_scale (view);
-  texture_width = roundf (rect->width * view_scale);
-  texture_height = roundf (rect->height * view_scale);
  image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                      texture_width, texture_height);
+                                      rect->width * view_scale,
+                                      rect->height * view_scale);
  cairo_surface_set_device_scale (image, view_scale, view_scale);

-
  data = cairo_image_surface_get_data (image);
  stride = cairo_image_surface_get_stride (image);

-  capture_view_into (stage, paint, view, rect, data, stride);
+  backend = clutter_get_default_backend ();
+  context = clutter_backend_get_cogl_context (backend);
+  bitmap = cogl_bitmap_new_for_data (context,
+                                     rect->width * view_scale,
+                                     rect->height * view_scale,
+                                     CLUTTER_CAIRO_FORMAT_ARGB32,
+                                     stride,
+                                     data);
+
+  clutter_stage_view_get_layout (view, &view_layout);
+
+  cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
+                                            (rect->x - view_layout.x) * view_scale,
+                                            (rect->y - view_layout.y) * view_scale,
+                                            COGL_READ_PIXELS_COLOR_BUFFER,
+                                            bitmap);
+
+  if (paint)
+    cogl_pop_framebuffer ();
+
+  capture->rect = *rect;
  capture->image = image;

  cairo_surface_mark_dirty (capture->image);
+  cogl_object_unref (bitmap);
 }

 gboolean
@@ -4809,91 +4827,34 @@ clutter_stage_capture (ClutterStage          *stage,
  ClutterCapture *captures;
  int n_captures;

-  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE);
-
  captures = g_new0 (ClutterCapture, g_list_length (views));
  n_captures = 0;

  for (l = views; l; l = l->next)
    {
      ClutterStageView *view = l->data;
-      ClutterCapture *capture;
      cairo_rectangle_int_t view_layout;
      cairo_region_t *region;
+      cairo_rectangle_int_t view_capture_rect;

      clutter_stage_view_get_layout (view, &view_layout);
      region = cairo_region_create_rectangle (&view_layout);
      cairo_region_intersect_rectangle (region, rect);
-
-      capture = &captures[n_captures];
-      cairo_region_get_extents (region, &capture->rect);
+      cairo_region_get_extents (region, &view_capture_rect);
      cairo_region_destroy (region);

-      if (capture->rect.width == 0 || capture->rect.height == 0)
+      if (view_capture_rect.width == 0 || view_capture_rect.height == 0)
        continue;

-      capture_view (stage, paint, view, capture);
+      capture_view (stage, paint, view, &view_capture_rect,
+                    &captures[n_captures]);

      n_captures++;
    }

-  if (n_captures == 0)
-    g_clear_pointer (&captures, g_free);
-
  *out_captures = captures;
  *out_n_captures = n_captures;

-  return n_captures > 0;
-}
-
-gboolean
-clutter_stage_get_capture_final_size (ClutterStage          *stage,
-                                      cairo_rectangle_int_t *rect,
-                                      int                   *out_width,
-                                      int                   *out_height,
-                                      float                 *out_scale)
-{
-  float max_scale;
-
-  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE);
-
-  if (rect)
-    {
-      ClutterRect capture_rect;
-
-      _clutter_util_rect_from_rectangle (rect, &capture_rect);
-      if (!_clutter_stage_get_max_view_scale_factor_for_rect (stage,
-                                                              &capture_rect,
-                                                              &max_scale))
-        return FALSE;
-
-      if (out_width)
-        *out_width = (gint) roundf (rect->width * max_scale);
-
-      if (out_height)
-        *out_height = (gint) roundf (rect->height * max_scale);
-    }
-  else
-    {
-      ClutterActorBox alloc;
-      float stage_width, stage_height;
-
-      clutter_actor_get_allocation_box (CLUTTER_ACTOR (stage), &alloc);
-      clutter_actor_box_get_size (&alloc, &stage_width, &stage_height);
-      if (!_clutter_actor_get_real_resource_scale (CLUTTER_ACTOR (stage),
-                                                   &max_scale))
-        return FALSE;
-
-      if (out_width)
-        *out_width = (gint) roundf (stage_width * max_scale);
-
-      if (out_height)
-        *out_height = (gint) roundf (stage_height * max_scale);
-    }
-
-  if (out_scale)
-    *out_scale = max_scale;
-
  return TRUE;
 }

@@ -4910,11 +4871,6 @@ capture_view_into (ClutterStage          *stage,
  CoglContext *context;
  CoglBitmap *bitmap;
  cairo_rectangle_int_t view_layout;
-  float view_scale;
-  float texture_width;
-  float texture_height;
-
-  g_return_if_fail (CLUTTER_IS_STAGE (stage));

  framebuffer = clutter_stage_view_get_framebuffer (view);

@@ -4925,14 +4881,10 @@ capture_view_into (ClutterStage          *stage,
      clutter_stage_do_paint_view (stage, view, rect);
    }

-  view_scale = clutter_stage_view_get_scale (view);
-  texture_width = roundf (rect->width * view_scale);
-  texture_height = roundf (rect->height * view_scale);
-
  backend = clutter_get_default_backend ();
  context = clutter_backend_get_cogl_context (backend);
  bitmap = cogl_bitmap_new_for_data (context,
-                                     texture_width, texture_height,
+                                     rect->width, rect->height,
                                     CLUTTER_CAIRO_FORMAT_ARGB32,
                                     stride,
                                     data);
@@ -4940,8 +4892,8 @@ capture_view_into (ClutterStage          *stage,
  clutter_stage_view_get_layout (view, &view_layout);

  cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
-                                            roundf ((rect->x - view_layout.x) * view_scale),
-                                            roundf ((rect->y - view_layout.y) * view_scale),
+                                            rect->x - view_layout.x,
+                                            rect->y - view_layout.y,
                                            COGL_READ_PIXELS_COLOR_BUFFER,
                                            bitmap);

@@ -5050,46 +5002,3 @@ clutter_stage_thaw_updates (ClutterStage *stage)
      _clutter_master_clock_set_paused (master_clock, FALSE);
    }
 }
-
-GList *
-_clutter_stage_peek_stage_views (ClutterStage *stage)
-{
-  ClutterStagePrivate *priv = stage->priv;
-
-  return _clutter_stage_window_get_views (priv->impl);
-}
-
-void
-clutter_stage_update_resource_scales (ClutterStage *stage)
-{
-  _clutter_actor_queue_update_resource_scale_recursive (CLUTTER_ACTOR (stage));
-}
-
-gboolean
-_clutter_stage_get_max_view_scale_factor_for_rect (ClutterStage *stage,
-                                                   ClutterRect  *rect,
-                                                   float        *view_scale)
-{
-  ClutterStagePrivate *priv = stage->priv;
-  float scale = 0.0f;
-  GList *l;
-
-  for (l = _clutter_stage_window_get_views (priv->impl); l; l = l->next)
-    {
-      ClutterStageView *view = l->data;
-      cairo_rectangle_int_t view_layout;
-      ClutterRect view_rect;
-
-      clutter_stage_view_get_layout (view, &view_layout);
-      _clutter_util_rect_from_rectangle (&view_layout, &view_rect);
-
-      if (clutter_rect_intersection (&view_rect, rect, NULL))
-        scale = MAX (clutter_stage_view_get_scale (view), scale);
-    }
-
-  if (scale == 0.0)
-    return FALSE;
-
-  *view_scale = scale;
-  return TRUE;
-}
--- a/clutter/clutter/clutter-stage.h
+++ b/clutter/clutter/clutter-stage.h
@@ -261,13 +261,6 @@ CLUTTER_EXPORT
 void            clutter_stage_skip_sync_delay                   (ClutterStage          *stage);
 #endif

-CLUTTER_EXPORT
-gboolean clutter_stage_get_capture_final_size (ClutterStage          *stage,
-                                               cairo_rectangle_int_t *rect,
-                                               int                   *width,
-                                               int                   *height,
-                                               float                 *scale);
-
 CLUTTER_EXPORT
 gboolean clutter_stage_capture (ClutterStage          *stage,
                                gboolean               paint,
--- a/clutter/clutter/clutter-text-buffer.c
+++ b/clutter/clutter/clutter-text-buffer.c
@@ -50,8 +50,7 @@
 /* Initial size of buffer, in bytes */
 #define MIN_SIZE 16

-enum
-{
+enum {
  PROP_0,
  PROP_TEXT,
  PROP_LENGTH,
@@ -61,8 +60,7 @@ enum

 static GParamSpec *obj_props[PROP_LAST] = { NULL, };

-enum
-{
+enum {
  INSERTED_TEXT,
  DELETED_TEXT,
  LAST_SIGNAL
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -144,17 +144,15 @@ struct _ClutterTextPrivate
   */
  gint x_pos;

-  /* the x position of the PangoLayout (in both physical and logical pixels)
-   * when in single line mode, to scroll the contents of the
+  /* the x position of the PangoLayout when in
+   * single line mode, to scroll the contents of the
   * text actor
   */
  gint text_x;
-  gint text_logical_x;

-  /* the y position of the PangoLayout (in both physical and logical pixels),
-   * fixed to 0 by default for now */
+  /* the y position of the PangoLayout, fixed to 0 by
+   * default for now */
  gint text_y;
-  gint text_logical_y;

  /* Where to draw the cursor */
  ClutterRect cursor_rect;
@@ -187,9 +185,6 @@ struct _ClutterTextPrivate
  ClutterInputContentHintFlags input_hints;
  ClutterInputContentPurpose input_purpose;

-  /* Signal handler for when the :resource-scale changes */
-  guint resource_scale_changed_id;
-
  /* bitfields */
  guint alignment               : 2;
  guint wrap                    : 1;
@@ -295,33 +290,6 @@ G_DECLARE_FINAL_TYPE (ClutterTextInputFocus, clutter_text_input_focus,
 G_DEFINE_TYPE (ClutterTextInputFocus, clutter_text_input_focus,
               CLUTTER_TYPE_INPUT_FOCUS)

-/* Utilities pango to (logical) pixels functions */
-static float
-pixels_to_pango (float px)
-{
-  return ceilf (px * (float) PANGO_SCALE);
-}
-
-static float
-logical_pixels_to_pango (float px,
-                         float scale)
-{
-  return pixels_to_pango (px * scale);
-}
-
-static float
-pango_to_pixels (float size)
-{
-  return ceilf (size / (float) PANGO_SCALE);
-}
-
-static float
-pango_to_logical_pixels (float size,
-                         float scale)
-{
-  return pango_to_pixels (size / scale);
-}
-
 static void
 clutter_text_input_focus_request_surrounding (ClutterInputFocus *focus)
 {
@@ -582,63 +550,6 @@ clutter_text_get_display_text (ClutterText *self)
    }
 }

-static void
-ensure_effective_pango_scale_attribute (ClutterText *self)
-{
-  float resource_scale;
-  ClutterTextPrivate *priv = self->priv;
-
-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (self), &resource_scale) ||
-      resource_scale == 1.0)
-    return;
-
-  if (priv->effective_attrs != NULL)
-    {
-      PangoAttrIterator *iter;
-      PangoAttribute *scale_attrib;
-      PangoAttrList *old_attributes;
-
-      old_attributes = priv->effective_attrs;
-      priv->effective_attrs = pango_attr_list_copy (priv->effective_attrs);
-      pango_attr_list_unref (old_attributes);
-
-      iter = pango_attr_list_get_iterator (priv->effective_attrs);
-      scale_attrib = pango_attr_iterator_get (iter, PANGO_ATTR_SCALE);
-
-      if (scale_attrib != NULL)
-        resource_scale *= ((PangoAttrFloat *) scale_attrib)->value;
-
-      pango_attr_iterator_destroy (iter);
-    }
-  else
-    priv->effective_attrs = pango_attr_list_new ();
-
-  pango_attr_list_change (priv->effective_attrs,
-                          pango_attr_scale_new (resource_scale));
-}
-
-static void
-set_effective_pango_attributes (ClutterText   *self,
-                                PangoAttrList *attributes)
-{
-  ClutterTextPrivate *priv = self->priv;
-
-  if (attributes != NULL)
-    {
-      PangoAttrList *old_attributes = priv->effective_attrs;
-      priv->effective_attrs = pango_attr_list_ref (attributes);
-
-      if (old_attributes != NULL)
-        pango_attr_list_unref (old_attributes);
-    }
-  else
-    {
-      g_clear_pointer (&priv->effective_attrs, pango_attr_list_unref);
-    }
-
-  ensure_effective_pango_scale_attribute (self);
-}
-
 static inline void
 clutter_text_ensure_effective_attributes (ClutterText *self)
 {
@@ -652,25 +563,21 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
  /* Same as if we don't have any attribute at all.
   * We also ignore markup attributes for editable. */
  if (priv->attrs == NULL && (priv->editable || priv->markup_attrs == NULL))
-    {
-      set_effective_pango_attributes (self, NULL);
-      return;
-    }
+    return;

  if (priv->attrs != NULL)
    {
      /* If there are no markup attributes, or if this is editable (in which
       * case we ignore markup), then we can just use these attrs directly */
      if (priv->editable || priv->markup_attrs == NULL)
-        set_effective_pango_attributes (self, priv->attrs);
+        priv->effective_attrs = pango_attr_list_ref (priv->attrs);
      else
        {
          /* Otherwise we need to merge the two lists */
-          PangoAttrList *effective_attrs;
          PangoAttrIterator *iter;
          GSList *attributes, *l;

-          effective_attrs = pango_attr_list_copy (priv->markup_attrs);
+          priv->effective_attrs = pango_attr_list_copy (priv->markup_attrs);

          iter = pango_attr_list_get_iterator (priv->attrs);
          do
@@ -681,7 +588,7 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
                {
                  PangoAttribute *attr = l->data;

-                  pango_attr_list_insert (effective_attrs, attr);
+                  pango_attr_list_insert (priv->effective_attrs, attr);
                }

              g_slist_free (attributes);
@@ -689,14 +596,12 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
          while (pango_attr_iterator_next (iter));

          pango_attr_iterator_destroy (iter);
-
-          set_effective_pango_attributes (self, effective_attrs);
-          pango_attr_list_unref (effective_attrs);
        }
    }
  else if (priv->markup_attrs != NULL)
    {
-      set_effective_pango_attributes (self, priv->markup_attrs);
+      /* We can just use the markup attributes directly */
+      priv->effective_attrs = pango_attr_list_ref (priv->markup_attrs);
    }
 }

@@ -751,7 +656,7 @@ clutter_text_create_layout_no_cache (ClutterText       *text,
      if (priv->password_char != 0)
        pango_dir = PANGO_DIRECTION_NEUTRAL;
      else
-        pango_dir = _clutter_pango_find_base_dir (contents, contents_len);
+        pango_dir = pango_find_base_dir (contents, contents_len);

      if (pango_dir == PANGO_DIRECTION_NEUTRAL)
        {
@@ -905,18 +810,6 @@ clutter_text_direction_changed_cb (GObject    *gobject,
  /* no need to queue a relayout: set_text_direction() will do that for us */
 }

-static void
-clutter_text_resource_scale_changed_cb (GObject    *gobject,
-                                        GParamSpec *pspec)
-{
-  ClutterText *self = CLUTTER_TEXT (gobject);
-  ClutterTextPrivate *priv = self->priv;
-
-  g_clear_pointer (&priv->effective_attrs, pango_attr_list_unref);
-  clutter_text_dirty_cache (self);
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (gobject));
-}
-
 /*
 * clutter_text_create_layout:
 * @text: a #ClutterText
@@ -984,7 +877,7 @@ clutter_text_create_layout (ClutterText *text,
       !((priv->editable && priv->single_line_mode) ||
         (priv->ellipsize == PANGO_ELLIPSIZE_NONE && !priv->wrap))))
    {
-      width = pixels_to_pango (allocation_width);
+      width = allocation_width * 1024 + 0.5f;
    }

  /* Pango only uses height if ellipsization is enabled, so don't set
@@ -1001,7 +894,7 @@ clutter_text_create_layout (ClutterText *text,
      priv->ellipsize != PANGO_ELLIPSIZE_NONE &&
      !priv->single_line_mode)
    {
-      height = pixels_to_pango (allocation_height);
+      height = allocation_height * 1024 + 0.5f;
    }

  /* Search for a cached layout with the same width and keep
@@ -1098,37 +991,6 @@ clutter_text_create_layout (ClutterText *text,
  return oldest_cache->layout;
 }

-static PangoLayout *
-create_text_layout_with_scale (ClutterText *text,
-                               gfloat       allocation_width,
-                               gfloat       allocation_height,
-                               gfloat       scale)
-{
-  if (allocation_width > 0)
-    allocation_width = roundf (allocation_width * scale);
-
-  if (allocation_height > 0)
-    allocation_height = roundf (allocation_height * scale);
-
-  return clutter_text_create_layout (text, allocation_width, allocation_height);
-}
-
-static PangoLayout *
-maybe_create_text_layout_with_resource_scale (ClutterText *text,
-                                              gfloat       allocation_width,
-                                              gfloat       allocation_height)
-{
-  float resource_scale;
-
-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (text), &resource_scale))
-    return NULL;
-
-  return create_text_layout_with_scale (text,
-                                        allocation_width,
-                                        allocation_height,
-                                        resource_scale);
-}
-
 /**
 * clutter_text_coords_to_position:
 * @self: a #ClutterText
@@ -1149,18 +1011,14 @@ clutter_text_coords_to_position (ClutterText *self,
  gint index_;
  gint px, py;
  gint trailing;
-  gfloat resource_scale;

  g_return_val_if_fail (CLUTTER_IS_TEXT (self), 0);

-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (self), &resource_scale))
-    return 0;
-
  /* Take any offset due to scrolling into account, and normalize
   * the coordinates to PangoScale units
   */
-  px = logical_pixels_to_pango (x - self->priv->text_logical_x, resource_scale);
-  py = logical_pixels_to_pango (y - self->priv->text_logical_y, resource_scale);
+  px = (x - self->priv->text_x) * PANGO_SCALE;
+  py = (y - self->priv->text_y) * PANGO_SCALE;

  pango_layout_xy_to_index (clutter_text_get_layout (self),
                            px, py,
@@ -1169,12 +1027,26 @@ clutter_text_coords_to_position (ClutterText *self,
  return index_ + trailing;
 }

-static gboolean
-clutter_text_position_to_coords_internal (ClutterText *self,
-                                          gint         position,
-                                          gfloat      *x,
-                                          gfloat      *y,
-                                          gfloat      *line_height)
+/**
+ * clutter_text_position_to_coords:
+ * @self: a #ClutterText
+ * @position: position in characters
+ * @x: (out): return location for the X coordinate, or %NULL
+ * @y: (out): return location for the Y coordinate, or %NULL
+ * @line_height: (out): return location for the line height, or %NULL
+ *
+ * Retrieves the coordinates of the given @position.
+ *
+ * Return value: %TRUE if the conversion was successful
+ *
+ * Since: 1.0
+ */
+gboolean
+clutter_text_position_to_coords (ClutterText *self,
+                                 gint         position,
+                                 gfloat      *x,
+                                 gfloat      *y,
+                                 gfloat      *line_height)
 {
  ClutterTextPrivate *priv;
  PangoRectangle rect;
@@ -1240,7 +1112,7 @@ clutter_text_position_to_coords_internal (ClutterText *self,

  if (x)
    {
-      *x = pango_to_pixels (rect.x);
+      *x = (gfloat) rect.x / 1024.0f;

      /* Take any offset due to scrolling into account */
      if (priv->single_line_mode)
@@ -1248,58 +1120,14 @@ clutter_text_position_to_coords_internal (ClutterText *self,
    }

  if (y)
-    *y = pango_to_pixels (rect.y);
+    *y = (gfloat) rect.y / 1024.0f;

  if (line_height)
-    *line_height = pango_to_pixels (rect.height);
+    *line_height = (gfloat) rect.height / 1024.0f;

  return TRUE;
 }

-/**
- * clutter_text_position_to_coords:
- * @self: a #ClutterText
- * @position: position in characters
- * @x: (out): return location for the X coordinate, or %NULL
- * @y: (out): return location for the Y coordinate, or %NULL
- * @line_height: (out): return location for the line height, or %NULL
- *
- * Retrieves the coordinates of the given @position.
- *
- * Return value: %TRUE if the conversion was successful
- *
- * Since: 1.0
- */
-gboolean
-clutter_text_position_to_coords (ClutterText *self,
-                                 gint         position,
-                                 gfloat      *x,
-                                 gfloat      *y,
-                                 gfloat      *line_height)
-{
-  gfloat resource_scale;
-  gboolean ret;
-
-  g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
-
-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (self), &resource_scale))
-    return FALSE;
-
-  ret = clutter_text_position_to_coords_internal (self, position,
-                                                  x, y, line_height);
-
-  if (x)
-    *x /= resource_scale;
-
-  if (y)
-    *y /= resource_scale;
-
-  if (line_height)
-    *line_height /= resource_scale;
-
-  return ret;
-}
-
 static inline void
 update_cursor_location (ClutterText *self)
 {
@@ -1317,8 +1145,7 @@ update_cursor_location (ClutterText *self)
 }

 static inline void
-clutter_text_ensure_cursor_position (ClutterText *self,
-                                     float        scale)
+clutter_text_ensure_cursor_position (ClutterText *self)
 {
  ClutterTextPrivate *priv = self->priv;
  gfloat x, y, cursor_height;
@@ -1341,15 +1168,15 @@ clutter_text_ensure_cursor_position (ClutterText *self,
                priv->preedit_set ? priv->preedit_cursor_pos : 0);

  x = y = cursor_height = 0;
-  clutter_text_position_to_coords_internal (self, position,
-                                            &x, &y,
-                                            &cursor_height);
+  clutter_text_position_to_coords (self, position,
+                                   &x, &y,
+                                   &cursor_height);

  clutter_rect_init (&cursor_rect,
                     x,
-                     y + CURSOR_Y_PADDING * scale,
-                     priv->cursor_size * scale,
-                     cursor_height - 2 * CURSOR_Y_PADDING * scale);
+                     y + CURSOR_Y_PADDING,
+                     priv->cursor_size,
+                     cursor_height - 2 * CURSOR_Y_PADDING);

  if (!clutter_rect_equals (&priv->cursor_rect, &cursor_rect))
    {
@@ -1772,12 +1599,6 @@ clutter_text_dispose (GObject *gobject)
      priv->direction_changed_id = 0;
    }

-  if (priv->resource_scale_changed_id)
-    {
-      g_signal_handler_disconnect (self, priv->resource_scale_changed_id);
-      priv->resource_scale_changed_id = 0;
-    }
-
  if (priv->settings_changed_id)
    {
      g_signal_handler_disconnect (clutter_get_default_backend (),
@@ -1830,7 +1651,6 @@ typedef void (* ClutterTextSelectionFunc) (ClutterText           *text,

 static void
 clutter_text_foreach_selection_rectangle (ClutterText              *self,
-                                          float                     scale,
                                          ClutterTextSelectionFunc  func,
                                          gpointer                  user_data)
 {
@@ -1882,9 +1702,9 @@ clutter_text_foreach_selection_rectangle (ClutterText              *self,
                                      &n_ranges);
      pango_layout_line_x_to_index (line, 0, &index_, NULL);

-      clutter_text_position_to_coords_internal (self,
-                                                bytes_to_offset (utf8, index_),
-                                                NULL, &y, &height);
+      clutter_text_position_to_coords (self,
+                                       bytes_to_offset (utf8, index_),
+                                       NULL, &y, &height);

      box.y1 = y;
      box.y2 = y + height;
@@ -1894,18 +1714,18 @@ clutter_text_foreach_selection_rectangle (ClutterText              *self,
          gfloat range_x;
          gfloat range_width;

-          range_x = pango_to_pixels (ranges[i * 2]);
+          range_x = ranges[i * 2] / PANGO_SCALE;

          /* Account for any scrolling in single line mode */
          if (priv->single_line_mode)
            range_x += priv->text_x;


-          range_width = pango_to_pixels (ranges[i * 2 + 1] - ranges[i * 2]);
-          box.x1 = range_x;
-          box.x2 = ceilf (range_x + range_width);
+          range_width = ((gfloat) ranges[i * 2 + 1] - (gfloat) ranges[i * 2])
+                      / PANGO_SCALE;

-          clutter_actor_box_scale (&box, scale);
+          box.x1 = range_x;
+          box.x2 = ceilf (range_x + range_width + .5f);

          func (self, &box, user_data);
        }
@@ -1924,14 +1744,6 @@ add_selection_rectangle_to_path (ClutterText           *text,
  cogl_path_rectangle (user_data, box->x1, box->y1, box->x2, box->y2);
 }

-static void
-clutter_text_foreach_selection_rectangle_prescaled (ClutterText              *self,
-                                                    ClutterTextSelectionFunc  func,
-                                                    gpointer                  user_data)
-{
-  clutter_text_foreach_selection_rectangle (self, 1.0f, func, user_data);
-}
-
 /* Draws the selected text, its background, and the cursor */
 static void
 selection_paint (ClutterText     *self,
@@ -1987,9 +1799,9 @@ selection_paint (ClutterText     *self,
      else
        color = &priv->text_color;

-      clutter_text_foreach_selection_rectangle_prescaled (self,
-                                                          add_selection_rectangle_to_path,
-                                                          selection_path);
+      clutter_text_foreach_selection_rectangle (self,
+                                                add_selection_rectangle_to_path,
+                                                selection_path);

      cogl_path_fill (selection_path);

@@ -2186,8 +1998,7 @@ clutter_text_press (ClutterActor *actor,
    return CLUTTER_EVENT_PROPAGATE;

  clutter_actor_grab_key_focus (actor);
-  clutter_input_focus_set_input_panel_state (priv->input_focus,
-                                             CLUTTER_INPUT_PANEL_STATE_TOGGLE);
+  clutter_input_focus_request_toggle_input_panel (priv->input_focus);

  /* if the actor is empty we just reset everything and not
   * set up the dragging of the selection since there's nothing
@@ -2579,7 +2390,6 @@ clutter_text_paint (ClutterActor *self)
  guint n_chars;
  float alloc_width;
  float alloc_height;
-  float resource_scale;

  fb = cogl_get_draw_framebuffer ();

@@ -2589,6 +2399,8 @@ clutter_text_paint (ClutterActor *self)
  n_chars = clutter_text_buffer_get_length (get_buffer (text));

  clutter_actor_get_allocation_box (self, &alloc);
+  alloc_width = alloc.x2 - alloc.x1;
+  alloc_height = alloc.y2 - alloc.y1;

  if (G_UNLIKELY (default_color_pipeline == NULL))
    {
@@ -2621,8 +2433,7 @@ clutter_text_paint (ClutterActor *self)
      cogl_framebuffer_draw_rectangle (fb,
                                       color_pipeline,
                                       0, 0,
-                                       clutter_actor_box_get_width (&alloc),
-                                       clutter_actor_box_get_height (&alloc));
+                                       alloc_width, alloc_height);

      cogl_object_unref (color_pipeline);
    }
@@ -2635,12 +2446,6 @@ clutter_text_paint (ClutterActor *self)
      !clutter_text_should_draw_cursor (text))
    return;

-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (self), &resource_scale))
-    return;
-
-  clutter_actor_box_scale (&alloc, resource_scale);
-  clutter_actor_box_get_size (&alloc, &alloc_width, &alloc_height);
-
  if (priv->editable && priv->single_line_mode)
    layout = clutter_text_create_layout (text, -1, -1);
  else
@@ -2672,15 +2477,8 @@ clutter_text_paint (ClutterActor *self)
        }
    }

-  if (resource_scale != 1.0f)
-    {
-      float paint_scale = 1.0f / resource_scale;
-      cogl_framebuffer_push_matrix (fb);
-      cogl_framebuffer_scale (fb, paint_scale, paint_scale, 1.0f);
-    }
-
  if (clutter_text_should_draw_cursor (text))
-    clutter_text_ensure_cursor_position (text, resource_scale);
+    clutter_text_ensure_cursor_position (text);

  if (priv->editable && priv->single_line_mode)
    {
@@ -2694,7 +2492,7 @@ clutter_text_paint (ClutterActor *self)
      clip_set = TRUE;

      actor_width = alloc_width - 2 * TEXT_PADDING;
-      text_width  = pango_to_pixels (logical_rect.width);
+      text_width  = logical_rect.width / PANGO_SCALE;

      rtl = priv->resolved_direction == PANGO_DIRECTION_RTL;

@@ -2751,10 +2549,8 @@ clutter_text_paint (ClutterActor *self)
    {
      priv->text_x = text_x;
      priv->text_y = text_y;
-      priv->text_logical_x = roundf ((float) text_x / resource_scale);
-      priv->text_logical_y = roundf ((float) text_y / resource_scale);

-      clutter_text_ensure_cursor_position (text, resource_scale);
+      clutter_text_ensure_cursor_position (text);
    }

  real_opacity = clutter_actor_get_paint_opacity (self)
@@ -2773,9 +2569,6 @@ clutter_text_paint (ClutterActor *self)

  selection_paint (text, fb);

-  if (resource_scale != 1.0f)
-    cogl_framebuffer_pop_matrix (fb);
-
  if (clip_set)
    cogl_framebuffer_pop_clip (fb);
 }
@@ -2805,32 +2598,26 @@ add_selection_to_paint_volume (ClutterText           *text,

 static void
 clutter_text_get_paint_volume_for_cursor (ClutterText        *text,
-                                          float               resource_scale,
                                          ClutterPaintVolume *volume)
 {
  ClutterTextPrivate *priv = text->priv;
  ClutterVertex origin;

-  clutter_text_ensure_cursor_position (text, resource_scale);
+  clutter_text_ensure_cursor_position (text);

  if (priv->position == priv->selection_bound)
    {
-      float width, height;
-
-      width = priv->cursor_rect.size.width / resource_scale;
-      height = priv->cursor_rect.size.height / resource_scale;
-      origin.x = priv->cursor_rect.origin.x / resource_scale;
-      origin.y = priv->cursor_rect.origin.y / resource_scale;
+      origin.x = priv->cursor_rect.origin.x;
+      origin.y = priv->cursor_rect.origin.y;
      origin.z = 0;

      clutter_paint_volume_set_origin (volume, &origin);
-      clutter_paint_volume_set_width (volume, width);
-      clutter_paint_volume_set_height (volume, height);
+      clutter_paint_volume_set_width (volume, priv->cursor_rect.size.width);
+      clutter_paint_volume_set_height (volume, priv->cursor_rect.size.height);
    }
  else
    {
      clutter_text_foreach_selection_rectangle (text,
-                                                1.0f / resource_scale,
                                                add_selection_to_paint_volume,
                                                volume);
    }
@@ -2853,7 +2640,6 @@ clutter_text_get_paint_volume (ClutterActor       *self,
      PangoLayout *layout;
      PangoRectangle ink_rect;
      ClutterVertex origin;
-      float resource_scale;

      /* If the text is single line editable then it gets clipped to
         the allocation anyway so we can just use that */
@@ -2868,24 +2654,19 @@ clutter_text_get_paint_volume (ClutterActor       *self,
      if (!clutter_actor_has_allocation (self))
        return FALSE;

-      if (!clutter_actor_get_resource_scale (self, &resource_scale))
-        return FALSE;
-
      _clutter_paint_volume_init_static (&priv->paint_volume, self);

      layout = clutter_text_get_layout (text);
      pango_layout_get_extents (layout, &ink_rect, NULL);

-      origin.x = pango_to_logical_pixels (ink_rect.x, resource_scale);
-      origin.y = pango_to_logical_pixels (ink_rect.y, resource_scale);
+      origin.x = ink_rect.x / (float) PANGO_SCALE;
+      origin.y = ink_rect.y / (float) PANGO_SCALE;
      origin.z = 0;
      clutter_paint_volume_set_origin (&priv->paint_volume, &origin);
      clutter_paint_volume_set_width (&priv->paint_volume,
-                                      pango_to_logical_pixels (ink_rect.width,
-                                                               resource_scale));
+                                      ink_rect.width / (float) PANGO_SCALE);
      clutter_paint_volume_set_height (&priv->paint_volume,
-                                       pango_to_logical_pixels (ink_rect.height,
-                                                                resource_scale));
+                                       ink_rect.height / (float) PANGO_SCALE);

      /* If the cursor is visible then that will likely be drawn
         outside of the ink rectangle so we should merge that in */
@@ -2895,8 +2676,7 @@ clutter_text_get_paint_volume (ClutterActor       *self,

          _clutter_paint_volume_init_static (&cursor_paint_volume, self);

-          clutter_text_get_paint_volume_for_cursor (text, resource_scale,
-                                                    &cursor_paint_volume);
+          clutter_text_get_paint_volume_for_cursor (text, &cursor_paint_volume);

          clutter_paint_volume_union (&priv->paint_volume,
                                      &cursor_paint_volume);
@@ -2924,12 +2704,9 @@ clutter_text_get_preferred_width (ClutterActor *self,
  PangoLayout *layout;
  gint logical_width;
  gfloat layout_width;
-  gfloat resource_scale;
-
-  if (!clutter_actor_get_resource_scale (self, &resource_scale))
-    resource_scale = 1;

  layout = clutter_text_create_layout (text, -1, -1);
+
  pango_layout_get_extents (layout, NULL, &logical_rect);

  /* the X coordinate of the logical rectangle might be non-zero
@@ -2939,7 +2716,7 @@ clutter_text_get_preferred_width (ClutterActor *self,
  logical_width = logical_rect.x + logical_rect.width;

  layout_width = logical_width > 0
-    ? pango_to_logical_pixels (logical_width, resource_scale)
+    ? ceilf (logical_width / 1024.0f)
    : 1;

  if (min_width_p)
@@ -2981,16 +2758,12 @@ clutter_text_get_preferred_height (ClutterActor *self,
      PangoRectangle logical_rect = { 0, };
      gint logical_height;
      gfloat layout_height;
-      gfloat resource_scale;
-
-      if (!clutter_actor_get_resource_scale (self, &resource_scale))
-        resource_scale = 1;

      if (priv->single_line_mode)
        for_width = -1;

-      layout = create_text_layout_with_scale (CLUTTER_TEXT (self),
-                                              for_width, -1, resource_scale);
+      layout = clutter_text_create_layout (CLUTTER_TEXT (self),
+                                           for_width, -1);

      pango_layout_get_extents (layout, NULL, &logical_rect);

@@ -2999,7 +2772,7 @@ clutter_text_get_preferred_height (ClutterActor *self,
       * the height accordingly
       */
      logical_height = logical_rect.y + logical_rect.height;
-      layout_height = pango_to_logical_pixels (logical_height, resource_scale);
+      layout_height = ceilf (logical_height / 1024.0f);

      if (min_height_p)
        {
@@ -3015,8 +2788,7 @@ clutter_text_get_preferred_height (ClutterActor *self,
              pango_layout_line_get_extents (line, NULL, &logical_rect);

              logical_height = logical_rect.y + logical_rect.height;
-              line_height = pango_to_logical_pixels (logical_height,
-                                                     resource_scale);
+              line_height = ceilf (logical_height / 1024.0f);

              *min_height_p = line_height;
            }
@@ -3047,9 +2819,9 @@ clutter_text_allocate (ClutterActor           *self,
  if (text->priv->editable && text->priv->single_line_mode)
    clutter_text_create_layout (text, -1, -1);
  else
-    maybe_create_text_layout_with_resource_scale (text,
-                                                  box->x2 - box->x1,
-                                                  box->y2 - box->y1);
+    clutter_text_create_layout (text,
+                                box->x2 - box->x1,
+                                box->y2 - box->y1);

  parent_class = CLUTTER_ACTOR_CLASS (clutter_text_parent_class);
  parent_class->allocate (self, box, flags);
@@ -4620,11 +4392,6 @@ clutter_text_init (ClutterText *self)
                      NULL);

  priv->input_focus = clutter_text_input_focus_new (self);
-
-  priv->resource_scale_changed_id =
-    g_signal_connect (self, "notify::resource-scale",
-                      G_CALLBACK (clutter_text_resource_scale_changed_cb),
-                      NULL);
 }

 /**
@@ -5735,7 +5502,6 @@ clutter_text_set_markup (ClutterText *self,
 PangoLayout *
 clutter_text_get_layout (ClutterText *self)
 {
-  PangoLayout *layout;
  gfloat width, height;

  g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
@@ -5744,12 +5510,8 @@ clutter_text_get_layout (ClutterText *self)
    return clutter_text_create_layout (self, -1, -1);

  clutter_actor_get_size (CLUTTER_ACTOR (self), &width, &height);
-  layout = maybe_create_text_layout_with_resource_scale (self, width, height);

-  if (!layout)
-    layout = clutter_text_create_layout (self, width, height);
-
-  return layout;
+  return clutter_text_create_layout (self, width, height);
 }

 /**
@@ -6753,10 +6515,10 @@ clutter_text_get_layout_offsets (ClutterText *self,
  priv = self->priv;

  if (x != NULL)
-    *x = priv->text_logical_x;
+    *x = priv->text_x;

  if (y != NULL)
-    *y = priv->text_logical_y;
+    *y = priv->text_y;
 }

 /**
--- a/clutter/clutter/clutter-texture.h
+++ b/clutter/clutter/clutter-texture.h
@@ -53,8 +53,7 @@ G_BEGIN_DECLS
 *
 * Since: 0.4
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY,
  CLUTTER_TEXTURE_ERROR_NO_YUV,
  CLUTTER_TEXTURE_ERROR_BAD_FORMAT
--- a/clutter/clutter/clutter-types.h
+++ b/clutter/clutter/clutter-types.h
@@ -361,10 +361,6 @@ void                    clutter_rect_inset              (ClutterRect       *rect
                                                         float              d_x,
                                                         float              d_y);
 CLUTTER_EXPORT
-void                    clutter_rect_scale              (ClutterRect       *rect,
-                                                         float              s_x,
-                                                         float              s_y);
-CLUTTER_EXPORT
 void                    clutter_rect_clamp_to_pixel     (ClutterRect       *rect);
 CLUTTER_EXPORT
 float                   clutter_rect_get_x              (ClutterRect       *rect);
@@ -564,10 +560,6 @@ void             clutter_actor_box_set_size       (ClutterActorBox       *box,
                                                   gfloat                 width,
                                                   gfloat                 height);

-CLUTTER_EXPORT
-void             clutter_actor_box_scale          (ClutterActorBox       *box,
-                                                   gfloat                 scale);
-
 /**
 * ClutterGeometry:
 * @x: X coordinate of the top left corner of an actor
--- a/clutter/clutter/clutter-util.c
+++ b/clutter/clutter/clutter-util.c
@@ -32,7 +32,6 @@

 #include "clutter-build-config.h"

-#include <fribidi.h>
 #include <math.h>

 #include "clutter-debug.h"
@@ -106,50 +105,6 @@ _clutter_util_fully_transform_vertices (const CoglMatrix *modelview,
    }
 }

-void
-_clutter_util_rect_from_rectangle (const cairo_rectangle_int_t *src,
-                                   ClutterRect                 *dest)
-{
-  *dest = (ClutterRect) {
-    .origin = {
-      .x = src->x,
-      .y = src->y
-    },
-    .size = {
-      .width = src->width,
-      .height = src->height
-    }
-  };
-}
-
-void
-_clutter_util_rectangle_int_extents (const  ClutterRect    *src,
-                                     cairo_rectangle_int_t *dest)
-{
-  ClutterRect tmp = *src;
-
-  clutter_rect_clamp_to_pixel (&tmp);
-
-  *dest = (cairo_rectangle_int_t) {
-    .x = tmp.origin.x,
-    .y = tmp.origin.y,
-    .width = tmp.size.width,
-    .height = tmp.size.height,
-  };
-}
-
-void
-_clutter_util_rectangle_offset (const cairo_rectangle_int_t *src,
-                                int                          x,
-                                int                          y,
-                                cairo_rectangle_int_t       *dest)
-{
-  *dest = *src;
-
-  dest->x += x;
-  dest->y += y;
-}
-
 /*< private >
 * _clutter_util_rectangle_union:
 * @src1: first rectangle to union
@@ -700,45 +655,3 @@ clutter_interval_register_progress_func (GType               value_type,

  G_UNLOCK (progress_funcs);
 }
-
-PangoDirection
-_clutter_pango_unichar_direction (gunichar ch)
-{
-  FriBidiCharType fribidi_ch_type;
-
-  G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar));
-
-  fribidi_ch_type = fribidi_get_bidi_type (ch);
-
-  if (!FRIBIDI_IS_STRONG (fribidi_ch_type))
-    return PANGO_DIRECTION_NEUTRAL;
-  else if (FRIBIDI_IS_RTL (fribidi_ch_type))
-    return PANGO_DIRECTION_RTL;
-  else
-    return PANGO_DIRECTION_LTR;
-}
-
-PangoDirection
-_clutter_pango_find_base_dir (const gchar *text,
-                              gint         length)
-{
-  PangoDirection dir = PANGO_DIRECTION_NEUTRAL;
-  const gchar *p;
-
-  g_return_val_if_fail (text != NULL || length == 0, PANGO_DIRECTION_NEUTRAL);
-
-  p = text;
-  while ((length < 0 || p < text + length) && *p)
-    {
-      gunichar wc = g_utf8_get_char (p);
-
-      dir = _clutter_pango_unichar_direction (wc);
-
-      if (dir != PANGO_DIRECTION_NEUTRAL)
-        break;
-
-      p = g_utf8_next_char (p);
-    }
-
-  return dir;
-}
--- a/clutter/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
@@ -69,18 +69,13 @@ G_DEFINE_TYPE_WITH_CODE (ClutterStageCogl,
                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW,
                                                clutter_stage_window_iface_init));

-enum
-{
+enum {
  PROP_0,
  PROP_WRAPPER,
  PROP_BACKEND,
  PROP_LAST
 };

-static void
-clutter_stage_cogl_schedule_update (ClutterStageWindow *stage_window,
-                                    gint                sync_delay);
-
 static void
 clutter_stage_cogl_unrealize (ClutterStageWindow *stage_window)
 {
@@ -126,16 +121,6 @@ _clutter_stage_cogl_presented (ClutterStageCogl *stage_cogl,
    }

  _clutter_stage_presented (stage_cogl->wrapper, frame_event, frame_info);
-
-  if (frame_event == COGL_FRAME_EVENT_COMPLETE &&
-      stage_cogl->update_time != -1)
-    {
-      ClutterStageWindow *stage_window = CLUTTER_STAGE_WINDOW (stage_cogl);
-
-      stage_cogl->update_time = -1;
-      clutter_stage_cogl_schedule_update (stage_window,
-                                          stage_cogl->last_sync_delay);
-    }
 }

 static gboolean
@@ -166,15 +151,10 @@ clutter_stage_cogl_schedule_update (ClutterStageWindow *stage_window,
  gint64 now;
  float refresh_rate;
  gint64 refresh_interval;
-  int64_t min_render_time_allowed;
-  int64_t max_render_time_allowed;
-  int64_t next_presentation_time;

  if (stage_cogl->update_time != -1)
    return;

-  stage_cogl->last_sync_delay = sync_delay;
-
  now = g_get_monotonic_time ();

  if (sync_delay < 0)
@@ -203,18 +183,10 @@ clutter_stage_cogl_schedule_update (ClutterStageWindow *stage_window,
  if (refresh_interval == 0)
    refresh_interval = 16667; /* 1/60th second */

-  min_render_time_allowed = refresh_interval / 2;
-  max_render_time_allowed = refresh_interval - 1000 * sync_delay;
+  stage_cogl->update_time = stage_cogl->last_presentation_time + 1000 * sync_delay;

-  if (min_render_time_allowed > max_render_time_allowed)
-    min_render_time_allowed = max_render_time_allowed;
-
-  next_presentation_time = stage_cogl->last_presentation_time + refresh_interval;
-
-  while (next_presentation_time < now + min_render_time_allowed)
-    next_presentation_time += refresh_interval;
-
-  stage_cogl->update_time = next_presentation_time - max_render_time_allowed;
+  while (stage_cogl->update_time < now)
+    stage_cogl->update_time += refresh_interval;
 }

 static gint64
@@ -300,7 +272,7 @@ clutter_stage_cogl_ignoring_redraw_clips (ClutterStageWindow *stage_window)
 }

 /* A redraw clip represents (in stage coordinates) the bounding box of
- * something that needs to be redrawn. Typically they are added to the
+ * something that needs to be redraw. Typically they are added to the
 * StageWindow as a result of clutter_actor_queue_clipped_redraw() by
 * actors such as ClutterGLXTexturePixmap. All redraw clips are
 * discarded after the next paint.
@@ -529,8 +501,8 @@ fill_current_damage_history_and_step (ClutterStageView *view)
  *current_fb_damage = (cairo_rectangle_int_t) {
    .x = 0,
    .y = 0,
-    .width = ceilf (view_rect.width * fb_scale),
-    .height = ceilf (view_rect.height * fb_scale)
+    .width = view_rect.width * fb_scale,
+    .height = view_rect.height * fb_scale
  };
  view_priv->damage_index++;
 }
@@ -578,19 +550,31 @@ calculate_scissor_region (cairo_rectangle_int_t *fb_clip_region,
                          int                    fb_height,
                          cairo_rectangle_int_t *out_scissor_rect)
 {
-  *out_scissor_rect = *fb_clip_region;
+  int scissor_x;
+  int scissor_y;
+  int scissor_width;
+  int scissor_height;

-  if (subpixel_compensation == 0)
-    return;
+  scissor_x = fb_clip_region->x;
+  scissor_y = fb_clip_region->y;
+  scissor_width = fb_clip_region->width;
+  scissor_height = fb_clip_region->height;

  if (fb_clip_region->x > 0)
-    out_scissor_rect->x += subpixel_compensation;
+    scissor_x += subpixel_compensation;
  if (fb_clip_region->y > 0)
-    out_scissor_rect->y += subpixel_compensation;
+    scissor_y += subpixel_compensation;
  if (fb_clip_region->x + fb_clip_region->width < fb_width)
-    out_scissor_rect->width -= 2 * subpixel_compensation;
+    scissor_width -= 2 * subpixel_compensation;
  if (fb_clip_region->y + fb_clip_region->height < fb_height)
-    out_scissor_rect->height -= 2 * subpixel_compensation;
+    scissor_height -= 2 * subpixel_compensation;
+
+  *out_scissor_rect = (cairo_rectangle_int_t) {
+    .x = scissor_x,
+    .y = scissor_y,
+    .width = scissor_width,
+    .height = scissor_height
+  };
 }

 static inline gboolean
@@ -602,18 +586,6 @@ is_buffer_age_enabled (void)
         cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_BUFFER_AGE);
 }

-static void
-scale_and_clamp_rect (const ClutterRect     *rect,
-                      float                  scale,
-                      cairo_rectangle_int_t *dest)
-
-{
-  ClutterRect tmp = *rect;
-
-  clutter_rect_scale (&tmp, scale, scale);
-  _clutter_util_rectangle_int_extents (&tmp, dest);
-}
-
 static gboolean
 clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
                                ClutterStageView   *view)
@@ -677,22 +649,21 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
       * frames when starting up... */
      cogl_onscreen_get_frame_counter (COGL_ONSCREEN (fb)) > 3)
    {
-      ClutterRect rect;
-
      may_use_clipped_redraw = TRUE;

-      _clutter_util_rect_from_rectangle (&redraw_clip, &rect);
-      clutter_rect_offset (&rect, -view_rect.x, -view_rect.y);
-      scale_and_clamp_rect (&rect, fb_scale, &fb_clip_region);
-
      if (fb_scale != floorf (fb_scale))
-        {
-          subpixel_compensation = ceilf (fb_scale);
-          fb_clip_region.x -= subpixel_compensation;
-          fb_clip_region.y -= subpixel_compensation;
-          fb_clip_region.width += 2 * subpixel_compensation;
-          fb_clip_region.height += 2 * subpixel_compensation;
-        }
+        subpixel_compensation = ceilf (fb_scale);
+
+      fb_clip_region = (cairo_rectangle_int_t) {
+        .x = (floorf ((redraw_clip.x - view_rect.x) * fb_scale) -
+              subpixel_compensation),
+        .y = (floorf ((redraw_clip.y - view_rect.y) * fb_scale) -
+              subpixel_compensation),
+        .width = (ceilf (redraw_clip.width * fb_scale) +
+                  (2 * subpixel_compensation)),
+        .height = (ceilf (redraw_clip.height * fb_scale) +
+                   (2 * subpixel_compensation))
+      };
    }
  else
    {
@@ -720,7 +691,6 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,

          if (valid_buffer_age (view_cogl, age))
            {
-              ClutterRect rect;
              cairo_rectangle_int_t damage_region;

              *current_fb_damage = fb_clip_region;
@@ -736,12 +706,12 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
                }

              /* Update the bounding redraw clip state with the extra damage. */
-              _clutter_util_rect_from_rectangle (&fb_clip_region, &rect);
-              scale_and_clamp_rect (&rect, 1.0f / fb_scale, &damage_region);
-              _clutter_util_rectangle_offset (&damage_region,
-                                              view_rect.x,
-                                              view_rect.y,
-                                              &damage_region);
+              damage_region = (cairo_rectangle_int_t) {
+                .x = view_rect.x + floorf (fb_clip_region.x / fb_scale),
+                .y = view_rect.y + floorf (fb_clip_region.y / fb_scale),
+                .width = ceilf (fb_clip_region.width / fb_scale),
+                .height = ceilf (fb_clip_region.height / fb_scale)
+              };
              _clutter_util_rectangle_union (&stage_cogl->bounding_redraw_clip,
                                             &damage_region,
                                             &stage_cogl->bounding_redraw_clip);
@@ -780,9 +750,7 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
    }
  else if (use_clipped_redraw)
    {
-      ClutterRect rect;
      cairo_rectangle_int_t scissor_rect;
-      cairo_rectangle_int_t paint_rect;

      calculate_scissor_region (&fb_clip_region,
                                subpixel_compensation,
@@ -803,15 +771,13 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
                                          scissor_rect.y,
                                          scissor_rect.width,
                                          scissor_rect.height);
-
-      _clutter_util_rect_from_rectangle (&fb_clip_region, &rect);
-      scale_and_clamp_rect (&rect, 1.0f / fb_scale, &paint_rect);
-      _clutter_util_rectangle_offset (&paint_rect,
-                                      view_rect.x,
-                                      view_rect.y,
-                                      &paint_rect);
-
-      paint_stage (stage_cogl, view, &paint_rect);
+      paint_stage (stage_cogl, view,
+                   &(cairo_rectangle_int_t) {
+                     .x = view_rect.x + floorf ((fb_clip_region.x - 0) / fb_scale),
+                     .y = view_rect.y + floorf ((fb_clip_region.y - 0) / fb_scale),
+                     .width = ceilf ((fb_clip_region.width + 0) / fb_scale),
+                     .height = ceilf ((fb_clip_region.height + 0) / fb_scale)
+                   });
      cogl_framebuffer_pop_clip (fb);

      stage_cogl->using_clipped_redraw = FALSE;
@@ -826,9 +792,7 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
          may_use_clipped_redraw &&
          !clip_region_empty)
        {
-          ClutterRect rect;
          cairo_rectangle_int_t scissor_rect;
-          cairo_rectangle_int_t paint_rect;

          calculate_scissor_region (&fb_clip_region,
                                    subpixel_compensation,
@@ -840,15 +804,13 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
                                              scissor_rect.y,
                                              scissor_rect.width,
                                              scissor_rect.height);
-
-          _clutter_util_rect_from_rectangle (&fb_clip_region, &rect);
-          scale_and_clamp_rect (&rect, 1.0f / fb_scale, &paint_rect);
-          _clutter_util_rectangle_offset (&paint_rect,
-                                          view_rect.x,
-                                          view_rect.y,
-                                          &paint_rect);
-
-          paint_stage (stage_cogl, view, &paint_rect);
+          paint_stage (stage_cogl, view,
+                       &(cairo_rectangle_int_t) {
+                         .x = view_rect.x + floorf (fb_clip_region.x / fb_scale),
+                         .y = view_rect.y + floorf (fb_clip_region.y / fb_scale),
+                         .width = ceilf (fb_clip_region.width / fb_scale),
+                         .height = ceilf (fb_clip_region.height / fb_scale)
+                       });
          cogl_framebuffer_pop_clip (fb);
        }
      else
--- a/clutter/clutter/cogl/clutter-stage-cogl.h
+++ b/clutter/clutter/cogl/clutter-stage-cogl.h
@@ -59,8 +59,6 @@ struct _ClutterStageCogl
   * junk frames to start with. */
  unsigned int frame_count;

-  gint last_sync_delay;
-
  cairo_rectangle_int_t bounding_redraw_clip;

  guint initialized_redraw_clip : 1;
--- a/clutter/clutter/deprecated/clutter-actor-deprecated.c
+++ b/clutter/clutter/deprecated/clutter-actor-deprecated.c
@@ -7,6 +7,7 @@

 #include "clutter-actor-private.h"
 #include "clutter-private.h"
+#include "clutter-shader.h"

 /**
 * clutter_actor_get_allocation_geometry:
--- a/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
--- a/clutter/clutter/deprecated/clutter-behaviour-ellipse.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-ellipse.h
@@ -0,0 +1,159 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Tomas Frydrych  <tf@openedhand.com>
+ *
+ * Copyright (C) 2007 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_BEHAVIOUR_ELLIPSE_H__
+#define __CLUTTER_BEHAVIOUR_ELLIPSE_H__
+
+#include <clutter/clutter-types.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_TYPE_BEHAVIOUR_ELLIPSE (clutter_behaviour_ellipse_get_type ())
+
+#define CLUTTER_BEHAVIOUR_ELLIPSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+  CLUTTER_TYPE_BEHAVIOUR_ELLIPSE, ClutterBehaviourEllipse))
+
+#define CLUTTER_BEHAVIOUR_ELLIPSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+  CLUTTER_TYPE_BEHAVIOUR_ELLIPSE, ClutterBehaviourEllipseClass))
+
+#define CLUTTER_IS_BEHAVIOUR_ELLIPSE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+  CLUTTER_TYPE_BEHAVIOUR_ELLIPSE))
+
+#define CLUTTER_IS_BEHAVIOUR_ELLIPSE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+  CLUTTER_TYPE_BEHAVIOUR_ELLIPSE))
+
+#define CLUTTER_BEHAVIOUR_ELLIPSE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+  CLUTTER_TYPE_BEHAVIOUR_ELLIPSE, ClutterBehaviourEllipseClass))
+
+typedef struct _ClutterBehaviourEllipse        ClutterBehaviourEllipse;
+typedef struct _ClutterBehaviourEllipsePrivate ClutterBehaviourEllipsePrivate;
+typedef struct _ClutterBehaviourEllipseClass   ClutterBehaviourEllipseClass;
+
+/**
+ * ClutterBehaviourEllipse:
+ *
+ * The #ClutterBehaviourEllipse struct contains only private data
+ * and should be accessed using the provided API
+ *
+ * Since: 0.4
+ *
+ * Deprecated: 1.6
+ */
+struct _ClutterBehaviourEllipse
+{
+  /*< private >*/
+  ClutterBehaviour parent_instance;
+  ClutterBehaviourEllipsePrivate *priv;
+};
+
+/**
+ * ClutterBehaviourEllipseClass:
+ *
+ * The #ClutterBehaviourEllipseClass struct contains only private data
+ *
+ * Since: 0.4
+ *
+ * Deprecated: 1.6
+ */
+struct _ClutterBehaviourEllipseClass
+{
+  /*< private >*/
+  ClutterBehaviourClass   parent_class;
+};
+
+CLUTTER_DEPRECATED
+GType clutter_behaviour_ellipse_get_type (void) G_GNUC_CONST;
+
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+ClutterBehaviour *     clutter_behaviour_ellipse_new             (ClutterAlpha            *alpha,
+								  gint                     x,
+								  gint                     y,
+								  gint                     width,
+								  gint                     height,
+								  ClutterRotateDirection   direction,
+								  gdouble                  start,
+								  gdouble                  end);
+
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_set_center      (ClutterBehaviourEllipse *self,
+								  gint                     x,
+								  gint                     y);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_get_center      (ClutterBehaviourEllipse *self,
+								  gint                    *x,
+								  gint                    *y);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_set_width       (ClutterBehaviourEllipse *self,
+								  gint                     width);
+CLUTTER_DEPRECATED
+gint                   clutter_behaviour_ellipse_get_width       (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_set_height      (ClutterBehaviourEllipse *self,
+								  gint                     height);
+CLUTTER_DEPRECATED
+gint                   clutter_behaviour_ellipse_get_height      (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
+								  gdouble                  angle_start);
+CLUTTER_DEPRECATED
+gdouble                clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_set_angle_end   (ClutterBehaviourEllipse *self,
+								  gdouble                  angle_end);
+CLUTTER_DEPRECATED
+gdouble                clutter_behaviour_ellipse_get_angle_end   (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_set_angle_tilt  (ClutterBehaviourEllipse *self,
+								  ClutterRotateAxis        axis,
+								  gdouble                  angle_tilt);
+CLUTTER_DEPRECATED
+gdouble                clutter_behaviour_ellipse_get_angle_tilt  (ClutterBehaviourEllipse *self,
+								  ClutterRotateAxis        axis);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_set_tilt        (ClutterBehaviourEllipse *self,
+								  gdouble                  angle_tilt_x,
+								  gdouble                  angle_tilt_y,
+								  gdouble                  angle_tilt_z);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_get_tilt        (ClutterBehaviourEllipse *self,
+								  gdouble                 *angle_tilt_x,
+								  gdouble                 *angle_tilt_y,
+								  gdouble                 *angle_tilt_z);
+CLUTTER_DEPRECATED
+ClutterRotateDirection clutter_behaviour_ellipse_get_direction   (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_ellipse_set_direction   (ClutterBehaviourEllipse *self,
+								  ClutterRotateDirection   direction);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_BEHAVIOUR_ELLIPSE_H__ */
--- a/clutter/clutter/deprecated/clutter-behaviour-path.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-path.c
@@ -0,0 +1,465 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By:
+ *      Matthew Allum  <mallum@openedhand.com>
+ *      Neil Roberts  <neil@linux.intel.com>
+ *
+ * Copyright (C) 2006, 2007, 2008 OpenedHand Ltd
+ * Copyright (C) 2009, 2010 Intel Corp
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * SECTION:clutter-behaviour-path
+ * @Title: ClutterBehaviourPath
+ * @short_description: A behaviour for moving actors along a #ClutterPath
+ * @Deprecated: 1.6: Use #ClutterPathConstraint and clutter_actor_animate()
+ *   with the #ClutterPathConstraint:offset property instead.
+ *
+ * #ClutterBehaviourPath interpolates actors along a defined path.
+ *
+ * A path is described by a #ClutterPath object. The path can contain
+ * straight line parts and bezier curves. If the path contains
+ * %CLUTTER_PATH_MOVE_TO parts then the actors will jump to those
+ * coordinates. This can be used make disjoint paths.
+ *
+ * When creating a path behaviour in a #ClutterScript, you can specify
+ * the path property directly as a string. For example:
+ *
+ * |[
+ * {
+ *   "id"     : "spline-path",
+ *   "type"   : "ClutterBehaviourPath",
+ *   "path"   : "M 50 50 L 100 100",
+ *   "alpha"  : {
+ *      "timeline" : "main-timeline",
+ *      "function" : "ramp
+ *    }
+ * }
+ * ]|
+ *
+ * If the alpha function is a periodic function, i.e. it returns to
+ * 0.0 after reaching 1.0, then the actors will walk the path back to the
+ * starting #ClutterKnot.
+ *
+ * #ClutterBehaviourPath is available since Clutter 0.2
+ *
+ * Deprecated: 1.6: Use #ClutterPath and #ClutterPathConstraint with
+ *   clutter_actor_animate() instead.
+ */
+
+#include "clutter-build-config.h"
+
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
+#include "clutter-alpha.h"
+#include "clutter-behaviour.h"
+#include "clutter-behaviour-path.h"
+#include "clutter-bezier.h"
+#include "clutter-debug.h"
+#include "clutter-enum-types.h"
+#include "clutter-main.h"
+#include "clutter-marshal.h"
+#include "clutter-private.h"
+#include "clutter-script-private.h"
+#include "clutter-scriptable.h"
+
+#include <math.h>
+
+struct _ClutterBehaviourPathPrivate
+{
+  ClutterPath *path;
+  guint        last_knot_passed;
+};
+
+enum
+{
+  KNOT_REACHED,
+
+  LAST_SIGNAL
+};
+
+static guint path_signals[LAST_SIGNAL] = { 0, };
+
+enum
+{
+  PROP_0,
+
+  PROP_PATH,
+
+  PROP_LAST
+};
+
+static GParamSpec *obj_props[PROP_LAST];
+
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ClutterBehaviourPath,
+                         clutter_behaviour_path,
+                         CLUTTER_TYPE_BEHAVIOUR,
+                         G_ADD_PRIVATE (ClutterBehaviourPath)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                clutter_scriptable_iface_init))
+
+static void
+actor_apply_knot_foreach (ClutterBehaviour *behaviour,
+                          ClutterActor     *actor,
+                          gpointer          data)
+{
+  ClutterKnot *knot = data;
+
+  CLUTTER_NOTE (ANIMATION, "Setting actor to %ix%i", knot->x, knot->y);
+
+  clutter_actor_set_position (actor, knot->x, knot->y);
+}
+
+static void
+clutter_behaviour_path_alpha_notify (ClutterBehaviour *behave,
+                                     gdouble           alpha_value)
+{
+  ClutterBehaviourPath *pathb = CLUTTER_BEHAVIOUR_PATH (behave);
+  ClutterBehaviourPathPrivate *priv = pathb->priv;
+  ClutterKnot position;
+  guint knot_num;
+
+  if (priv->path)
+    knot_num = clutter_path_get_position (priv->path, alpha_value, &position);
+  else
+    {
+      memset (&position, 0, sizeof (position));
+      knot_num = 0;
+    }
+
+  clutter_behaviour_actors_foreach (behave,
+                                    actor_apply_knot_foreach,
+                                    &position);
+
+  if (knot_num != priv->last_knot_passed)
+    {
+      g_signal_emit (behave, path_signals[KNOT_REACHED], 0, knot_num);
+      priv->last_knot_passed = knot_num;
+    }
+}
+
+static void
+clutter_behaviour_path_get_property (GObject      *gobject,
+                                     guint         prop_id,
+                                     GValue       *value,
+                                     GParamSpec   *pspec)
+{
+  ClutterBehaviourPath *pathb = CLUTTER_BEHAVIOUR_PATH (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_PATH:
+      g_value_set_object (value, clutter_behaviour_path_get_path (pathb));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+clutter_behaviour_path_set_property (GObject      *gobject,
+                                     guint         prop_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  ClutterBehaviourPath *pathb = CLUTTER_BEHAVIOUR_PATH (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_PATH:
+      clutter_behaviour_path_set_path (pathb, g_value_get_object (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+clutter_behaviour_path_dispose (GObject *gobject)
+{
+  ClutterBehaviourPath *pathb = CLUTTER_BEHAVIOUR_PATH (gobject);
+
+  clutter_behaviour_path_set_path (pathb, NULL);
+
+  G_OBJECT_CLASS (clutter_behaviour_path_parent_class)->dispose (gobject);
+}
+
+static void
+clutter_behaviour_path_class_init (ClutterBehaviourPathClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  ClutterBehaviourClass *behave_class = CLUTTER_BEHAVIOUR_CLASS (klass);
+  GParamSpec *pspec;
+
+  gobject_class->get_property = clutter_behaviour_path_get_property;
+  gobject_class->set_property = clutter_behaviour_path_set_property;
+  gobject_class->dispose = clutter_behaviour_path_dispose;
+
+  pspec = g_param_spec_object ("path",
+                               P_("Path"),
+                               P_("The ClutterPath object representing the path "
+                                  "to animate along"),
+                               CLUTTER_TYPE_PATH,
+                               CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_PATH] = pspec;
+  g_object_class_install_property (gobject_class, PROP_PATH, pspec);
+
+  /**
+   * ClutterBehaviourPath::knot-reached:
+   * @pathb: the object which received the signal
+   * @knot_num: the index of the #ClutterKnot reached
+   *
+   * This signal is emitted each time a node defined inside the path
+   * is reached.
+   *
+   * Since: 0.2
+   *
+   * Deprecated: 1.6
+   */
+  path_signals[KNOT_REACHED] =
+    g_signal_new ("knot-reached",
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (ClutterBehaviourPathClass, knot_reached),
+                  NULL, NULL,
+                  _clutter_marshal_VOID__UINT,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_UINT);
+
+  behave_class->alpha_notify = clutter_behaviour_path_alpha_notify;
+}
+
+static ClutterScriptableIface *parent_scriptable_iface = NULL;
+
+static gboolean
+clutter_behaviour_path_parse_custom_node (ClutterScriptable *scriptable,
+                                          ClutterScript     *script,
+                                          GValue            *value,
+                                          const gchar       *name,
+                                          JsonNode          *node)
+{
+  if (strcmp ("path", name) == 0)
+    {
+      ClutterPath *path;
+      GValue node_value = { 0 };
+
+      path = g_object_ref_sink (clutter_path_new ());
+
+      json_node_get_value (node, &node_value);
+
+      if (!G_VALUE_HOLDS (&node_value, G_TYPE_STRING)
+          || !clutter_path_set_description (path,
+                                            g_value_get_string (&node_value)))
+        g_warning ("Invalid path description");
+
+      g_value_unset (&node_value);
+
+      g_value_init (value, G_TYPE_OBJECT);
+      g_value_take_object (value, path);
+
+      return TRUE;
+    }
+  /* chain up */
+  else if (parent_scriptable_iface->parse_custom_node)
+    return parent_scriptable_iface->parse_custom_node (scriptable, script,
+                                                       value, name, node);
+  else
+    return FALSE;
+}
+
+static void
+clutter_scriptable_iface_init (ClutterScriptableIface *iface)
+{
+  parent_scriptable_iface = g_type_interface_peek_parent (iface);
+
+  if (!parent_scriptable_iface)
+    parent_scriptable_iface
+      = g_type_default_interface_peek (CLUTTER_TYPE_SCRIPTABLE);
+
+  iface->parse_custom_node = clutter_behaviour_path_parse_custom_node;
+}
+
+static void
+clutter_behaviour_path_init (ClutterBehaviourPath *self)
+{
+  self->priv = clutter_behaviour_path_get_instance_private (self);
+  self->priv->last_knot_passed = G_MAXUINT;
+}
+
+/**
+ * clutter_behaviour_path_new:
+ * @alpha: (allow-none): a #ClutterAlpha instance, or %NULL
+ * @path: a #ClutterPath or %NULL for an empty path
+ *
+ * Creates a new path behaviour. You can use this behaviour to drive
+ * actors along the nodes of a path, described by @path.
+ *
+ * This will claim the floating reference on the #ClutterPath so you
+ * do not need to unref if it.
+ *
+ * If @alpha is not %NULL, the #ClutterBehaviour will take ownership
+ * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
+ * it can be set later with clutter_behaviour_set_alpha().
+ *
+ * Return value: (transfer full): a #ClutterBehaviour
+ *
+ * Since: 0.2
+ *
+ * Deprecated: 1.6
+ */
+ClutterBehaviour *
+clutter_behaviour_path_new (ClutterAlpha *alpha,
+                            ClutterPath  *path)
+{
+  return g_object_new (CLUTTER_TYPE_BEHAVIOUR_PATH,
+                       "alpha", alpha,
+                       "path", path,
+                       NULL);
+}
+
+/**
+ * clutter_behaviour_path_new_with_description:
+ * @alpha: (allow-none): a #ClutterAlpha instance, or %NULL
+ * @desc: a string description of the path
+ *
+ * Creates a new path behaviour using the path described by @desc. See
+ * clutter_path_add_string() for a description of the format.
+ *
+ * If @alpha is not %NULL, the #ClutterBehaviour will take ownership
+ * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
+ * it can be set later with clutter_behaviour_set_alpha().
+ *
+ * Return value: (transfer full): a #ClutterBehaviour
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.6
+ */
+ClutterBehaviour *
+clutter_behaviour_path_new_with_description (ClutterAlpha *alpha,
+                                             const gchar  *desc)
+{
+  return g_object_new (CLUTTER_TYPE_BEHAVIOUR_PATH,
+                       "alpha", alpha,
+                       "path", clutter_path_new_with_description (desc),
+                       NULL);
+}
+
+/**
+ * clutter_behaviour_path_new_with_knots:
+ * @alpha: (allow-none): a #ClutterAlpha instance, or %NULL
+ * @knots: (array length=n_knots): an array of #ClutterKnot<!-- -->s
+ * @n_knots: number of entries in @knots
+ *
+ * Creates a new path behaviour that will make the actors visit all of
+ * the given knots in order with straight lines in between.
+ *
+ * A path will be created where the first knot is used in a
+ * %CLUTTER_PATH_MOVE_TO and the subsequent knots are used in
+ * %CLUTTER_PATH_LINE_TO<!-- -->s.
+ *
+ * If @alpha is not %NULL, the #ClutterBehaviour will take ownership
+ * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
+ * it can be set later with clutter_behaviour_set_alpha().
+ *
+ * Return value: (transfer full): a #ClutterBehaviour
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.6
+ */
+ClutterBehaviour *
+clutter_behaviour_path_new_with_knots (ClutterAlpha      *alpha,
+                                       const ClutterKnot *knots,
+                                       guint              n_knots)
+{
+  ClutterPath *path = clutter_path_new ();
+  guint i;
+
+  if (n_knots > 0)
+    {
+      clutter_path_add_move_to (path, knots[0].x, knots[0].y);
+
+      for (i = 1; i < n_knots; i++)
+        clutter_path_add_line_to (path, knots[i].x, knots[i].y);
+    }
+
+  return g_object_new (CLUTTER_TYPE_BEHAVIOUR_PATH,
+                       "alpha", alpha,
+                       "path", path,
+                       NULL);
+}
+
+/**
+ * clutter_behaviour_path_set_path:
+ * @pathb: the path behaviour
+ * @path: the new path to follow
+ *
+ * Change the path that the actors will follow. This will take the
+ * floating reference on the #ClutterPath so you do not need to unref
+ * it.
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.6
+ */
+void
+clutter_behaviour_path_set_path (ClutterBehaviourPath *pathb,
+                                 ClutterPath          *path)
+{
+  ClutterBehaviourPathPrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_BEHAVIOUR_PATH (pathb));
+
+  priv = pathb->priv;
+
+  if (path)
+    g_object_ref_sink (path);
+
+  if (priv->path)
+    g_object_unref (priv->path);
+
+  priv->path = path;
+
+  g_object_notify_by_pspec (G_OBJECT (pathb), obj_props[PROP_PATH]);
+}
+
+/**
+ * clutter_behaviour_path_get_path:
+ * @pathb: a #ClutterBehaviourPath instance
+ *
+ * Get the current path of the behaviour
+ *
+ * Return value: (transfer none): the path
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.6
+ */
+ClutterPath *
+clutter_behaviour_path_get_path (ClutterBehaviourPath *pathb)
+{
+  g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_PATH (pathb), NULL);
+
+  return pathb->priv->path;
+}
--- a/clutter/clutter/deprecated/clutter-behaviour-path.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-path.h
@@ -0,0 +1,135 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *             Jorn Baayen  <jorn@openedhand.com>
+ *             Emmanuele Bassi  <ebassi@openedhand.com>
+ *
+ * Copyright (C) 2006 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_BEHAVIOUR_PATH_H__
+#define __CLUTTER_BEHAVIOUR_PATH_H__
+
+#include <clutter/clutter-types.h>
+#include <clutter/clutter-path.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_TYPE_BEHAVIOUR_PATH (clutter_behaviour_path_get_type ())
+
+#define CLUTTER_BEHAVIOUR_PATH(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+  CLUTTER_TYPE_BEHAVIOUR_PATH, ClutterBehaviourPath))
+
+#define CLUTTER_BEHAVIOUR_PATH_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+  CLUTTER_TYPE_BEHAVIOUR_PATH, ClutterBehaviourPathClass))
+
+#define CLUTTER_IS_BEHAVIOUR_PATH(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+  CLUTTER_TYPE_BEHAVIOUR_PATH))
+
+#define CLUTTER_IS_BEHAVIOUR_PATH_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+  CLUTTER_TYPE_BEHAVIOUR_PATH))
+
+#define CLUTTER_BEHAVIOUR_PATH_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+  CLUTTER_TYPE_BEHAVIOUR_PATH, ClutterBehaviourPathClass))
+
+typedef struct _ClutterBehaviourPath        ClutterBehaviourPath;
+typedef struct _ClutterBehaviourPathPrivate ClutterBehaviourPathPrivate;
+typedef struct _ClutterBehaviourPathClass   ClutterBehaviourPathClass;
+
+/**
+ * ClutterBehaviourPath:
+ *
+ * The #ClutterBehaviourPath structure contains only private data
+ * and should be accessed using the provided API
+ *
+ * Since: 0.2
+ *
+ * Deprecated: 1.6: Use #ClutterPathConstraint and clutter_actor_animate()
+ *   instead.
+ */
+struct _ClutterBehaviourPath
+{
+  /*< private >*/
+  ClutterBehaviour             parent;
+  ClutterBehaviourPathPrivate *priv;
+};
+
+/**
+ * ClutterBehaviourPathClass:
+ * @knot_reached: signal class handler for the
+ *   ClutterBehaviourPath::knot_reached signal
+ *
+ * The #ClutterBehaviourPathClass struct contains only private data
+ *
+ * Since: 0.2
+ *
+ * Deprecated: 1.6
+ */
+struct _ClutterBehaviourPathClass
+{
+  /*< private >*/
+  ClutterBehaviourClass   parent_class;
+
+  /*< public >*/
+  void (*knot_reached) (ClutterBehaviourPath *pathb,
+                        guint                 knot_num);
+
+  /*< private >*/
+  void (*_clutter_path_1) (void);
+  void (*_clutter_path_2) (void);
+  void (*_clutter_path_3) (void);
+  void (*_clutter_path_4) (void);
+};
+
+CLUTTER_DEPRECATED
+GType clutter_behaviour_path_get_type (void) G_GNUC_CONST;
+
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+ClutterBehaviour *clutter_behaviour_path_new          (ClutterAlpha         *alpha,
+                                                       ClutterPath          *path);
+
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+ClutterBehaviour *clutter_behaviour_path_new_with_description
+                                                      (ClutterAlpha         *alpha,
+                                                       const gchar          *desc);
+
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+ClutterBehaviour *clutter_behaviour_path_new_with_knots
+                                                      (ClutterAlpha         *alpha,
+                                                       const ClutterKnot    *knots,
+                                                       guint                 n_knots);
+
+CLUTTER_DEPRECATED
+void              clutter_behaviour_path_set_path     (ClutterBehaviourPath *pathb,
+                                                       ClutterPath          *path);
+CLUTTER_DEPRECATED
+ClutterPath *     clutter_behaviour_path_get_path     (ClutterBehaviourPath *pathb);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_BEHAVIOUR_PATH_H__ */
--- a/clutter/clutter/deprecated/clutter-behaviour-rotate.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-rotate.c
@@ -0,0 +1,688 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *
+ * Copyright (C) 2007 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * SECTION:clutter-behaviour-rotate
+ * @short_description: A behaviour controlling rotation
+ *
+ * A #ClutterBehaviourRotate rotate actors between a starting and ending
+ * angle on a given axis.
+ *
+ * The #ClutterBehaviourRotate is available since version 0.4.
+ *
+ * Deprecated: 1.6: Use the #ClutterActor rotation properties and
+ *   clutter_actor_animate(), or #ClutterAnimator, or #ClutterState
+ *   instead.
+ */
+
+#include "clutter-build-config.h"
+
+#include <math.h>
+
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+#include "deprecated/clutter-actor.h"
+
+#include "clutter-alpha.h"
+#include "clutter-behaviour.h"
+#include "clutter-behaviour-rotate.h"
+#include "clutter-debug.h"
+#include "clutter-enum-types.h"
+#include "clutter-main.h"
+#include "clutter-private.h"
+
+struct _ClutterBehaviourRotatePrivate
+{
+  gdouble angle_start;
+  gdouble angle_end;
+
+  ClutterRotateAxis axis;
+  ClutterRotateDirection direction;
+
+  gint center_x;
+  gint center_y;
+  gint center_z;
+};
+
+enum
+{
+  PROP_0,
+
+  PROP_ANGLE_START,
+  PROP_ANGLE_END,
+  PROP_AXIS,
+  PROP_DIRECTION,
+  PROP_CENTER_X,
+  PROP_CENTER_Y,
+  PROP_CENTER_Z,
+
+  PROP_LAST
+};
+
+static GParamSpec *obj_props[PROP_LAST];
+
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBehaviourRotate,
+                            clutter_behaviour_rotate,
+                            CLUTTER_TYPE_BEHAVIOUR)
+
+typedef struct {
+  gdouble angle;
+} RotateFrameClosure;
+
+static void
+alpha_notify_foreach (ClutterBehaviour *behaviour,
+		      ClutterActor     *actor,
+		      gpointer          data)
+{
+  RotateFrameClosure *closure = data;
+  ClutterBehaviourRotate *rotate_behaviour;
+  ClutterBehaviourRotatePrivate *priv;
+
+  rotate_behaviour = CLUTTER_BEHAVIOUR_ROTATE (behaviour);
+  priv = rotate_behaviour->priv;
+
+  clutter_actor_set_rotation (actor, priv->axis,
+                              closure->angle,
+                              priv->center_x,
+                              priv->center_y,
+                              priv->center_z);
+}
+
+static inline float
+clamp_angle (float a)
+{
+  float a1, a2;
+  gint rounds;
+
+  rounds = a / 360.0;
+  a1 = rounds * 360.0;
+  a2 = a - a1;
+
+  return a2;
+}
+
+static void
+clutter_behaviour_rotate_alpha_notify (ClutterBehaviour *behaviour,
+                                       gdouble           alpha_value)
+{
+  ClutterBehaviourRotate *rotate_behaviour;
+  ClutterBehaviourRotatePrivate *priv;
+  RotateFrameClosure closure;
+  gdouble start, end;
+
+  rotate_behaviour = CLUTTER_BEHAVIOUR_ROTATE (behaviour);
+  priv = rotate_behaviour->priv;
+
+  closure.angle = 0;
+  start         = priv->angle_start;
+  end           = priv->angle_end;
+
+  if (priv->direction == CLUTTER_ROTATE_CW && start >= end)
+    end += 360.0;
+  else if (priv->direction == CLUTTER_ROTATE_CCW && start <= end)
+    end -= 360.0;
+
+  closure.angle = (end - start) * alpha_value + start;
+
+  clutter_behaviour_actors_foreach (behaviour,
+				    alpha_notify_foreach,
+				    &closure);
+}
+
+static void
+clutter_behaviour_rotate_set_property (GObject      *gobject,
+                                       guint         prop_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  ClutterBehaviourRotate *rotate;
+  ClutterBehaviourRotatePrivate *priv;
+
+  rotate = CLUTTER_BEHAVIOUR_ROTATE (gobject);
+  priv = rotate->priv;
+
+  switch (prop_id)
+    {
+    case PROP_ANGLE_START:
+      priv->angle_start = g_value_get_double (value);
+      break;
+
+    case PROP_ANGLE_END:
+      priv->angle_end = g_value_get_double (value);
+      break;
+
+    case PROP_AXIS:
+      priv->axis = g_value_get_enum (value);
+      break;
+
+    case PROP_DIRECTION:
+      priv->direction = g_value_get_enum (value);
+      break;
+
+    case PROP_CENTER_X:
+      clutter_behaviour_rotate_set_center (rotate,
+					   g_value_get_int (value),
+					   priv->center_y,
+					   priv->center_z);
+      break;
+
+    case PROP_CENTER_Y:
+      clutter_behaviour_rotate_set_center (rotate,
+					   priv->center_x,
+					   g_value_get_int (value),
+					   priv->center_z);
+      break;
+
+    case PROP_CENTER_Z:
+      clutter_behaviour_rotate_set_center (rotate,
+					   priv->center_x,
+					   priv->center_y,
+					   g_value_get_int (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+clutter_behaviour_rotate_get_property (GObject    *gobject,
+                                       guint       prop_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  ClutterBehaviourRotatePrivate *priv;
+
+  priv = CLUTTER_BEHAVIOUR_ROTATE (gobject)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_ANGLE_START:
+      g_value_set_double (value, priv->angle_start);
+      break;
+
+    case PROP_ANGLE_END:
+      g_value_set_double (value, priv->angle_end);
+      break;
+
+    case PROP_AXIS:
+      g_value_set_enum (value, priv->axis);
+      break;
+
+    case PROP_DIRECTION:
+      g_value_set_enum (value, priv->direction);
+      break;
+
+    case PROP_CENTER_X:
+      g_value_set_int (value, priv->center_x);
+      break;
+
+    case PROP_CENTER_Y:
+      g_value_set_int (value, priv->center_y);
+      break;
+
+    case PROP_CENTER_Z:
+      g_value_set_int (value, priv->center_z);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+clutter_behaviour_rotate_class_init (ClutterBehaviourRotateClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  ClutterBehaviourClass *behaviour_class = CLUTTER_BEHAVIOUR_CLASS (klass);
+  GParamSpec *pspec = NULL;
+
+  gobject_class->set_property = clutter_behaviour_rotate_set_property;
+  gobject_class->get_property = clutter_behaviour_rotate_get_property;
+
+  behaviour_class->alpha_notify = clutter_behaviour_rotate_alpha_notify;
+
+  /**
+   * ClutterBehaviourRotate:angle-start:
+   *
+   * The initial angle from whence the rotation should start.
+   *
+   * Since: 0.4
+   */
+  pspec = g_param_spec_double ("angle-start",
+                               P_("Angle Begin"),
+                               P_("Initial angle"),
+                               0.0, 360.0,
+                               0.0,
+                               CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_ANGLE_START] = pspec;
+  g_object_class_install_property (gobject_class,
+                                   PROP_ANGLE_START,
+                                   pspec);
+
+  /**
+   * ClutterBehaviourRotate:angle-end:
+   *
+   * The final angle to where the rotation should end.
+   *
+   * Since: 0.4
+   */
+  pspec = g_param_spec_double ("angle-end",
+                               P_("Angle End"),
+                               P_("Final angle"),
+                               0.0, 360.0,
+                               0.0,
+                               CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_ANGLE_END] = pspec;
+  g_object_class_install_property (gobject_class,
+                                   PROP_ANGLE_END,
+                                   pspec);
+
+  /**
+   * ClutterBehaviourRotate:axis:
+   *
+   * The axis of rotation.
+   *
+   * Since: 0.4
+   */
+  pspec = g_param_spec_enum ("axis",
+                             P_("Axis"),
+                             P_("Axis of rotation"),
+                             CLUTTER_TYPE_ROTATE_AXIS,
+                             CLUTTER_Z_AXIS,
+                             CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_AXIS] = pspec;
+  g_object_class_install_property (gobject_class,
+                                   PROP_AXIS,
+                                   pspec);
+
+  /**
+   * ClutterBehaviourRotate:direction:
+   *
+   * The direction of the rotation.
+   *
+   * Since: 0.4
+   */
+  pspec = g_param_spec_enum ("direction",
+                             P_("Direction"),
+                             P_("Direction of rotation"),
+                             CLUTTER_TYPE_ROTATE_DIRECTION,
+                             CLUTTER_ROTATE_CW,
+                             CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_DIRECTION] = pspec;
+  g_object_class_install_property (gobject_class,
+                                   PROP_DIRECTION,
+                                   pspec);
+
+  /**
+   * ClutterBehaviourRotate:center-x:
+   *
+   * The x center of rotation.
+   *
+   * Since: 0.4
+   */
+  pspec = g_param_spec_int ("center-x",
+                            P_("Center X"),
+                            P_("X coordinate of the center of rotation"),
+                            -G_MAXINT, G_MAXINT,
+                            0,
+                            CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_CENTER_X] = pspec;
+  g_object_class_install_property (gobject_class,
+                                   PROP_CENTER_X,
+                                   pspec);
+
+  /**
+   * ClutterBehaviourRotate:center-y:
+   *
+   * The y center of rotation.
+   *
+   * Since: 0.4
+   */
+  pspec = g_param_spec_int ("center-y",
+                            P_("Center Y"),
+                            P_("Y coordinate of the center of rotation"),
+                            -G_MAXINT, G_MAXINT,
+                            0,
+                            CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_CENTER_Y] = pspec;
+  g_object_class_install_property (gobject_class,
+                                   PROP_CENTER_Y,
+                                   pspec);
+
+  /**
+   * ClutterBehaviourRotate:center-z:
+   *
+   * The z center of rotation.
+   *
+   * Since: 0.4
+   */
+  pspec = g_param_spec_int ("center-z",
+                            P_("Center Z"),
+                            P_("Z coordinate of the center of rotation"),
+                            -G_MAXINT, G_MAXINT,
+                            0,
+                            CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_CENTER_Z] = pspec;
+  g_object_class_install_property (gobject_class,
+                                   PROP_CENTER_Z,
+                                   pspec);
+}
+
+static void
+clutter_behaviour_rotate_init (ClutterBehaviourRotate *self)
+{
+  self->priv = clutter_behaviour_rotate_get_instance_private (self);
+
+  self->priv->angle_start = 0.0;
+  self->priv->angle_end = 0.0;
+
+  self->priv->axis = CLUTTER_Z_AXIS;
+  self->priv->direction = CLUTTER_ROTATE_CW;
+
+  self->priv->center_x = 0;
+  self->priv->center_y = 0;
+  self->priv->center_z = 0;
+}
+
+/**
+ * clutter_behaviour_rotate_new:
+ * @alpha: (allow-none): a #ClutterAlpha instance, or %NULL
+ * @axis: the rotation axis
+ * @direction: the rotation direction
+ * @angle_start: the starting angle in degrees, between 0 and 360.
+ * @angle_end: the final angle in degrees, between 0 and 360.
+ *
+ * Creates a new #ClutterBehaviourRotate. This behaviour will rotate actors
+ * bound to it on @axis, following @direction, between @angle_start and
+ * @angle_end. Angles >= 360 degrees will be clamped to the canonical interval
+ * <0, 360), if angle_start == angle_end, the behaviour will carry out a
+ * single rotation of 360 degrees.
+ *
+ * If @alpha is not %NULL, the #ClutterBehaviour will take ownership
+ * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
+ * it can be set later with clutter_behaviour_set_alpha().
+ *
+ * Return value: the newly created #ClutterBehaviourRotate.
+ *
+ * Since: 0.4
+ */
+ClutterBehaviour *
+clutter_behaviour_rotate_new (ClutterAlpha           *alpha,
+                              ClutterRotateAxis       axis,
+                              ClutterRotateDirection  direction,
+                              gdouble                 angle_start,
+                              gdouble                 angle_end)
+{
+  g_return_val_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha), NULL);
+
+  return g_object_new (CLUTTER_TYPE_BEHAVIOUR_ROTATE,
+                       "alpha", alpha,
+                       "axis", axis,
+                       "direction", direction,
+                       "angle-start", angle_start,
+                       "angle-end", angle_end,
+                       NULL);
+}
+
+/**
+ * clutter_behaviour_rotate_get_axis:
+ * @rotate: a #ClutterBehaviourRotate
+ *
+ * Retrieves the #ClutterRotateAxis used by the rotate behaviour.
+ *
+ * Return value: the rotation axis
+ *
+ * Since: 0.4
+ */
+ClutterRotateAxis
+clutter_behaviour_rotate_get_axis (ClutterBehaviourRotate *rotate)
+{
+  g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ROTATE (rotate), CLUTTER_Z_AXIS);
+
+  return rotate->priv->axis;
+}
+
+/**
+ * clutter_behaviour_rotate_set_axis:
+ * @rotate: a #ClutterBehaviourRotate
+ * @axis: a #ClutterRotateAxis
+ *
+ * Sets the axis used by the rotate behaviour.
+ *
+ * Since: 0.4
+ */
+void
+clutter_behaviour_rotate_set_axis (ClutterBehaviourRotate *rotate,
+                                   ClutterRotateAxis       axis)
+{
+  ClutterBehaviourRotatePrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ROTATE (rotate));
+
+  priv = rotate->priv;
+
+  if (priv->axis != axis)
+    {
+      priv->axis = axis;
+
+      g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_AXIS]);
+    }
+}
+
+/**
+ * clutter_behaviour_rotate_get_direction:
+ * @rotate: a #ClutterBehaviourRotate
+ *
+ * Retrieves the #ClutterRotateDirection used by the rotate behaviour.
+ *
+ * Return value: the rotation direction
+ *
+ * Since: 0.4
+ */
+ClutterRotateDirection
+clutter_behaviour_rotate_get_direction (ClutterBehaviourRotate *rotate)
+{
+  g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR_ROTATE (rotate),
+                        CLUTTER_ROTATE_CW);
+
+  return rotate->priv->direction;
+}
+
+/**
+ * clutter_behaviour_rotate_set_direction:
+ * @rotate: a #ClutterBehaviourRotate
+ * @direction: the rotation direction
+ *
+ * Sets the rotation direction used by the rotate behaviour.
+ *
+ * Since: 0.4
+ */
+void
+clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate,
+                                        ClutterRotateDirection  direction)
+{
+  ClutterBehaviourRotatePrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ROTATE (rotate));
+
+  priv = rotate->priv;
+
+  if (priv->direction != direction)
+    {
+      priv->direction = direction;
+
+      g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_DIRECTION]);
+    }
+}
+
+/**
+ * clutter_behaviour_rotate_get_bounds:
+ * @rotate: a #ClutterBehaviourRotate
+ * @angle_start: (out): return value for the initial angle
+ * @angle_end: (out): return value for the final angle
+ *
+ * Retrieves the rotation boundaries of the rotate behaviour.
+ *
+ * Since: 0.4
+ */
+void
+clutter_behaviour_rotate_get_bounds (ClutterBehaviourRotate *rotate,
+                                     gdouble                *angle_start,
+                                     gdouble                *angle_end)
+{
+  ClutterBehaviourRotatePrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ROTATE (rotate));
+
+  priv = rotate->priv;
+
+  if (angle_start)
+    *angle_start = priv->angle_start;
+
+  if (angle_end)
+    *angle_end = priv->angle_end;
+}
+
+/**
+ * clutter_behaviour_rotate_set_bounds:
+ * @rotate: a #ClutterBehaviourRotate
+ * @angle_start: initial angle in degrees, between 0 and 360.
+ * @angle_end: final angle in degrees, between 0 and 360.
+ *
+ * Sets the initial and final angles of a rotation behaviour; angles >= 360
+ * degrees get clamped to the canonical interval <0, 360).
+ *
+ * Since: 0.4
+ */
+void
+clutter_behaviour_rotate_set_bounds (ClutterBehaviourRotate *rotate,
+                                     gdouble                 angle_start,
+                                     gdouble                 angle_end)
+{
+  ClutterBehaviourRotatePrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ROTATE (rotate));
+
+  priv = rotate->priv;
+
+  g_object_freeze_notify (G_OBJECT (rotate));
+
+  if (priv->angle_start != angle_start)
+    {
+      priv->angle_start = clamp_angle (angle_start);
+
+      g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_ANGLE_START]);
+    }
+
+  if (priv->angle_end != angle_end)
+    {
+      priv->angle_end = clamp_angle (angle_end);
+
+      g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_ANGLE_END]);
+    }
+
+  g_object_thaw_notify (G_OBJECT (rotate));
+}
+
+/**
+ * clutter_behaviour_rotate_set_center:
+ * @rotate: a #ClutterBehaviourRotate
+ * @x: X axis center of rotation
+ * @y: Y axis center of rotation
+ * @z: Z axis center of rotation
+ *
+ * Sets the center of rotation. The coordinates are relative to the plane
+ * normal to the rotation axis set with clutter_behaviour_rotate_set_axis().
+ *
+ * Since: 0.4
+ */
+void
+clutter_behaviour_rotate_set_center (ClutterBehaviourRotate *rotate,
+				     gint                    x,
+				     gint                    y,
+				     gint                    z)
+{
+  ClutterBehaviourRotatePrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ROTATE (rotate));
+
+  priv = rotate->priv;
+
+  g_object_freeze_notify (G_OBJECT (rotate));
+
+  if (priv->center_x != x)
+    {
+      priv->center_x = x;
+      g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_X]);
+    }
+
+  if (priv->center_y != y)
+    {
+      priv->center_y = y;
+      g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_Y]);
+    }
+
+  if (priv->center_z != z)
+    {
+      priv->center_z = z;
+      g_object_notify_by_pspec (G_OBJECT (rotate), obj_props[PROP_CENTER_Z]);
+    }
+
+  g_object_thaw_notify (G_OBJECT (rotate));
+}
+
+/**
+ * clutter_behaviour_rotate_get_center:
+ * @rotate: a #ClutterBehaviourRotate
+ * @x: (out): return location for the X center of rotation
+ * @y: (out): return location for the Y center of rotation
+ * @z: (out): return location for the Z center of rotation
+ *
+ * Retrieves the center of rotation set using
+ * clutter_behaviour_rotate_set_center().
+ *
+ * Since: 0.4
+ */
+void
+clutter_behaviour_rotate_get_center (ClutterBehaviourRotate *rotate,
+				     gint                   *x,
+				     gint                   *y,
+				     gint                   *z)
+{
+  ClutterBehaviourRotatePrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_BEHAVIOUR_ROTATE (rotate));
+
+  priv = rotate->priv;
+
+  if (x)
+    *x = priv->center_x;
+
+  if (y)
+    *y = priv->center_y;
+
+  if (z)
+    *z = priv->center_z;
+}
--- a/clutter/clutter/deprecated/clutter-behaviour-rotate.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-rotate.h
@@ -0,0 +1,119 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *
+ * Copyright (C) 2007 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_BEHAVIOUR_ROTATE_H__
+#define __CLUTTER_BEHAVIOUR_ROTATE_H__
+
+#include <clutter/clutter-types.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_TYPE_BEHAVIOUR_ROTATE            (clutter_behaviour_rotate_get_type ())
+#define CLUTTER_BEHAVIOUR_ROTATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotate))
+#define CLUTTER_IS_BEHAVIOUR_ROTATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE))
+#define CLUTTER_BEHAVIOUR_ROTATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotateClass))
+#define CLUTTER_IS_BEHAVIOUR_ROTATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BEHAVIOUR_ROTATE))
+#define CLUTTER_BEHAVIOUR_ROTATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((klass), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotateClass))
+
+typedef struct _ClutterBehaviourRotate          ClutterBehaviourRotate;
+typedef struct _ClutterBehaviourRotatePrivate   ClutterBehaviourRotatePrivate;
+typedef struct _ClutterBehaviourRotateClass     ClutterBehaviourRotateClass;
+
+/**
+ * ClutterBehaviourRotate:
+ *
+ * The #ClutterBehaviourRotate struct contains only private data and
+ * should be accessed using the provided API
+ *
+ * Since: 0.4
+ *
+ * Deprecated: 1.6: Use clutter_actor_animate() instead.
+ */
+struct _ClutterBehaviourRotate
+{
+  /*< private >*/
+  ClutterBehaviour parent_instance;
+
+  ClutterBehaviourRotatePrivate *priv;
+};
+
+/**
+ * ClutterBehaviourRotateClass:
+ *
+ * The #ClutterBehaviourRotateClass struct contains only private data
+ *
+ * Since: 0.4
+ *
+ * Deprecated: 1.6
+ */
+struct _ClutterBehaviourRotateClass
+{
+  /*< private >*/
+  ClutterBehaviourClass parent_class;
+};
+
+CLUTTER_DEPRECATED
+GType clutter_behaviour_rotate_get_type (void) G_GNUC_CONST;
+
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+ClutterBehaviour *     clutter_behaviour_rotate_new           (ClutterAlpha           *alpha,
+                                                               ClutterRotateAxis       axis,
+                                                               ClutterRotateDirection  direction,
+                                                               gdouble                 angle_start,
+                                                               gdouble                 angle_end);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_rotate_get_center    (ClutterBehaviourRotate *rotate,
+							       gint                   *x,
+							       gint                   *y,
+							       gint                   *z);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_rotate_set_center    (ClutterBehaviourRotate *rotate,
+							       gint                    x,
+							       gint                    y,
+							       gint                    z);
+CLUTTER_DEPRECATED
+ClutterRotateAxis      clutter_behaviour_rotate_get_axis      (ClutterBehaviourRotate *rotate);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_rotate_set_axis      (ClutterBehaviourRotate *rotate,
+                                                               ClutterRotateAxis       axis);
+CLUTTER_DEPRECATED
+ClutterRotateDirection clutter_behaviour_rotate_get_direction (ClutterBehaviourRotate *rotate);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate,
+                                                               ClutterRotateDirection  direction);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_rotate_get_bounds    (ClutterBehaviourRotate *rotate,
+                                                               gdouble                *angle_start,
+                                                               gdouble                *angle_end);
+CLUTTER_DEPRECATED
+void                   clutter_behaviour_rotate_set_bounds    (ClutterBehaviourRotate *rotate,
+                                                               gdouble                 angle_start,
+                                                               gdouble                 angle_end);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_BEHAVIOUR_ROTATE_H__ */
--- a/clutter/clutter/deprecated/clutter-behaviour.c
+++ b/clutter/clutter/deprecated/clutter-behaviour.c
@@ -101,8 +101,7 @@ enum

 static GParamSpec *obj_props[PROP_LAST];

-enum
-{
+enum {
  APPLIED,
  REMOVED,
  LAST_SIGNAL
--- a/clutter/clutter/deprecated/clutter-input-device-deprecated.c
+++ b/clutter/clutter/deprecated/clutter-input-device-deprecated.c
@@ -0,0 +1,36 @@
+#include "clutter-build-config.h"
+
+#include <glib-object.h>
+
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
+#include "clutter-device-manager-private.h"
+#include "deprecated/clutter-input-device.h"
+
+/**
+ * clutter_input_device_get_device_coords:
+ * @device: a #ClutterInputDevice of type %CLUTTER_POINTER_DEVICE
+ * @x: (out): return location for the X coordinate
+ * @y: (out): return location for the Y coordinate
+ *
+ * Retrieves the latest coordinates of the pointer of @device
+ *
+ * Since: 1.2
+ *
+ * Deprecated: 1.12: Use clutter_input_device_get_coords() instead.
+ */
+void
+clutter_input_device_get_device_coords (ClutterInputDevice *device,
+                                        gint               *x,
+                                        gint               *y)
+{
+  ClutterPoint point;
+
+  clutter_input_device_get_coords (device, NULL, &point);
+
+  if (x)
+    *x = point.x;
+
+  if (y)
+    *y = point.y;
+}
--- a/clutter/clutter/deprecated/clutter-input-device.h
+++ b/clutter/clutter/deprecated/clutter-input-device.h
@@ -0,0 +1,41 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright © 2009, 2010, 2011  Intel Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Emmanuele Bassi <ebassi@linux.intel.com>
+ */
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_INPUT_DEVICE_DEPRECATED_H__
+#define __CLUTTER_INPUT_DEVICE_DEPRECATED_H__
+
+#include <clutter/clutter-input-device.h>
+
+G_BEGIN_DECLS
+
+CLUTTER_DEPRECATED_FOR(clutter_input_device_get_coords)
+void clutter_input_device_get_device_coords  (ClutterInputDevice  *device,
+                                              gint                *x,
+                                              gint                *y);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_INPUT_DEVICE_DEPRECATED_H__ */
--- a/clutter/clutter/deprecated/clutter-list-model.c
+++ b/clutter/clutter/deprecated/clutter-list-model.c
@@ -0,0 +1,834 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *             Neil Jagdish Patel <njp@o-hand.com>
+ *             Emmanuele Bassi <ebassi@openedhand.com>
+ *
+ * Copyright (C) 2006 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
+/**
+ * SECTION:clutter-list-model
+ * @short_description: List model implementation
+ *
+ * #ClutterListModel is a #ClutterModel implementation provided by
+ * Clutter. #ClutterListModel uses a #GSequence for storing the
+ * values for each row, so it's optimized for insertion and look up
+ * in sorted lists.
+ *
+ * #ClutterListModel is available since Clutter 0.6
+ *
+ * Deprecated: 1.24: Use a #GListStore instance containing a custom
+ *   object type with properties for each column instead.
+ */
+
+#include "clutter-build-config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib-object.h>
+
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+#include "clutter-list-model.h"
+
+#include "clutter-model.h"
+#include "clutter-model-private.h"
+#include "clutter-private.h"
+#include "clutter-debug.h"
+
+#define CLUTTER_TYPE_LIST_MODEL_ITER                 \
+        (clutter_list_model_iter_get_type())
+#define CLUTTER_LIST_MODEL_ITER(obj)                 \
+        (G_TYPE_CHECK_INSTANCE_CAST((obj),           \
+         CLUTTER_TYPE_LIST_MODEL_ITER,               \
+         ClutterListModelIter))
+#define CLUTTER_IS_LIST_MODEL_ITER(obj)              \
+        (G_TYPE_CHECK_INSTANCE_TYPE((obj),           \
+         CLUTTER_TYPE_LIST_MODEL_ITER))
+#define CLUTTER_LIST_MODEL_ITER_CLASS(klass)         \
+        (G_TYPE_CHECK_CLASS_CAST ((klass),           \
+         CLUTTER_TYPE_LIST_MODEL_ITER,               \
+         ClutterListModelIterClass))
+#define CLUTTER_IS_LIST_MODEL_ITER_CLASS(klass)      \
+        (G_TYPE_CHECK_CLASS_TYPE ((klass),           \
+         CLUTTER_TYPE_LIST_MODEL_ITER))
+#define CLUTTER_LIST_MODEL_ITER_GET_CLASS(obj)       \
+        (G_TYPE_INSTANCE_GET_CLASS ((obj),           \
+         CLUTTER_TYPE_LIST_MODEL_ITER,               \
+         ClutterListModelIterClass))
+
+typedef struct _ClutterListModelIter    ClutterListModelIter;
+typedef struct _ClutterModelIterClass   ClutterListModelIterClass;
+
+struct _ClutterListModelPrivate
+{
+  GSequence *sequence;
+
+  ClutterModelIter *temp_iter;
+};
+
+struct _ClutterListModelIter
+{
+  ClutterModelIter parent_instance;
+
+  GSequenceIter *seq_iter;
+};
+
+
+
+GType clutter_list_model_iter_get_type (void);
+
+/*
+ * ClutterListModel
+ */
+
+G_DEFINE_TYPE (ClutterListModelIter,
+               clutter_list_model_iter,
+               CLUTTER_TYPE_MODEL_ITER)
+
+static void
+clutter_list_model_iter_get_value (ClutterModelIter *iter,
+                                   guint             column,
+                                   GValue           *value)
+{
+  ClutterListModelIter *iter_default;
+  GValue *values;
+  GValue *iter_value;
+  GValue real_value = G_VALUE_INIT;
+  gboolean converted = FALSE;
+
+  iter_default = CLUTTER_LIST_MODEL_ITER (iter);
+  g_assert (iter_default->seq_iter != NULL);
+
+  values = g_sequence_get (iter_default->seq_iter);
+  iter_value = &values[column];
+  g_assert (iter_value != NULL);
+
+  if (!g_type_is_a (G_VALUE_TYPE (value), G_VALUE_TYPE (iter_value)))
+    {
+      if (!g_value_type_compatible (G_VALUE_TYPE (value), 
+                                    G_VALUE_TYPE (iter_value)) &&
+          !g_value_type_compatible (G_VALUE_TYPE (iter_value), 
+                                    G_VALUE_TYPE (value)))
+        {
+          g_warning ("%s: Unable to convert from %s to %s",
+                     G_STRLOC,
+                     g_type_name (G_VALUE_TYPE (value)),
+                     g_type_name (G_VALUE_TYPE (iter_value)));
+          return;
+        }
+
+      if (!g_value_transform (iter_value, &real_value))
+        {
+          g_warning ("%s: Unable to make conversion from %s to %s",
+                     G_STRLOC, 
+                     g_type_name (G_VALUE_TYPE (value)),
+                     g_type_name (G_VALUE_TYPE (iter_value)));
+          g_value_unset (&real_value);
+        }
+
+      converted = TRUE;
+    }
+  
+  if (converted)
+    {
+      g_value_copy (&real_value, value);
+      g_value_unset (&real_value);
+    }
+  else
+    g_value_copy (iter_value, value);
+}
+
+static void
+clutter_list_model_iter_set_value (ClutterModelIter *iter,
+                                   guint             column,
+                                   const GValue     *value)
+{
+  ClutterListModelIter *iter_default;
+  GValue *values;
+  GValue *iter_value;
+  GValue real_value = G_VALUE_INIT;
+  gboolean converted = FALSE;
+
+  iter_default = CLUTTER_LIST_MODEL_ITER (iter);
+  g_assert (iter_default->seq_iter != NULL);
+
+  values = g_sequence_get (iter_default->seq_iter);
+  iter_value = &values[column];
+  g_assert (iter_value != NULL);
+
+  if (!g_type_is_a (G_VALUE_TYPE (value), G_VALUE_TYPE (iter_value)))
+    {
+      if (!g_value_type_compatible (G_VALUE_TYPE (value), 
+                                    G_VALUE_TYPE (iter_value)) &&
+          !g_value_type_compatible (G_VALUE_TYPE (iter_value), 
+                                    G_VALUE_TYPE (value)))
+        {
+          g_warning ("%s: Unable to convert from %s to %s\n",
+                     G_STRLOC,
+                     g_type_name (G_VALUE_TYPE (value)),
+                     g_type_name (G_VALUE_TYPE (iter_value)));
+          return;
+        }
+
+      if (!g_value_transform (value, &real_value))
+        {
+          g_warning ("%s: Unable to make conversion from %s to %s\n",
+                     G_STRLOC, 
+                     g_type_name (G_VALUE_TYPE (value)),
+                     g_type_name (G_VALUE_TYPE (iter_value)));
+          g_value_unset (&real_value);
+        }
+
+      converted = TRUE;
+    }
+ 
+  if (converted)
+    {
+      g_value_copy (&real_value, iter_value);
+      g_value_unset (&real_value);
+    }
+  else
+    g_value_copy (value, iter_value);
+}
+
+static gboolean
+clutter_list_model_iter_is_first (ClutterModelIter *iter)
+{
+  ClutterListModelIter *iter_default;
+  ClutterModel *model;
+  ClutterModelIter *temp_iter;
+  GSequence *sequence;
+  GSequenceIter *begin, *end;
+
+  iter_default = CLUTTER_LIST_MODEL_ITER (iter);
+  g_assert (iter_default->seq_iter != NULL);
+
+  model = clutter_model_iter_get_model (iter);
+
+  sequence = CLUTTER_LIST_MODEL (model)->priv->sequence;
+
+  begin = g_sequence_get_begin_iter (sequence);
+  end   = iter_default->seq_iter;
+
+  temp_iter = CLUTTER_LIST_MODEL (model)->priv->temp_iter;
+
+  while (!g_sequence_iter_is_begin (begin))
+    {
+      CLUTTER_LIST_MODEL_ITER (temp_iter)->seq_iter = begin;
+
+      if (clutter_model_filter_iter (model, temp_iter))
+        {
+          end = begin;
+          break;
+        }
+
+      begin = g_sequence_iter_next (begin);
+    }
+
+  /* This is because the 'begin_iter' is always *before* the last valid
+   * iter, otherwise we'd have endless loops 
+   */
+  end = g_sequence_iter_prev (end);
+
+  return iter_default->seq_iter == end;
+}
+
+static gboolean
+clutter_list_model_iter_is_last (ClutterModelIter *iter)
+{
+  ClutterListModelIter *iter_default;
+  ClutterModelIter *temp_iter;
+  ClutterModel *model;
+  GSequence *sequence;
+  GSequenceIter *begin, *end;
+
+  iter_default = CLUTTER_LIST_MODEL_ITER (iter);
+  g_assert (iter_default->seq_iter != NULL);
+
+  if (g_sequence_iter_is_end (iter_default->seq_iter))
+    return TRUE;
+
+  model = clutter_model_iter_get_model (iter);
+
+  sequence = CLUTTER_LIST_MODEL (model)->priv->sequence;
+
+  begin = g_sequence_get_end_iter (sequence);
+  begin = g_sequence_iter_prev (begin);
+  end   = iter_default->seq_iter;
+
+  temp_iter = CLUTTER_LIST_MODEL (model)->priv->temp_iter;
+
+  while (!g_sequence_iter_is_begin (begin))
+    {
+      CLUTTER_LIST_MODEL_ITER (temp_iter)->seq_iter = begin;
+
+      if (clutter_model_filter_iter (model, temp_iter))
+        {
+          end = begin;
+          break;
+        }
+
+      begin = g_sequence_iter_prev (begin);
+    }
+
+  /* This is because the 'end_iter' is always *after* the last valid iter.
+   * Otherwise we'd have endless loops 
+   */
+  end = g_sequence_iter_next (end);
+
+  return iter_default->seq_iter == end;
+}
+
+static ClutterModelIter *
+clutter_list_model_iter_next (ClutterModelIter *iter)
+{
+  ClutterListModelIter *iter_default;
+  ClutterModelIter *temp_iter;
+  ClutterModel *model = NULL;
+  GSequenceIter *filter_next;
+  guint row;
+
+  iter_default = CLUTTER_LIST_MODEL_ITER (iter);
+  g_assert (iter_default->seq_iter != NULL);
+
+  model = clutter_model_iter_get_model (iter);
+  row   = clutter_model_iter_get_row (iter);
+
+  filter_next = g_sequence_iter_next (iter_default->seq_iter);
+  g_assert (filter_next != NULL);
+
+  temp_iter = CLUTTER_LIST_MODEL (model)->priv->temp_iter;
+
+  while (!g_sequence_iter_is_end (filter_next))
+    {
+      CLUTTER_LIST_MODEL_ITER (temp_iter)->seq_iter = filter_next;
+
+      if (clutter_model_filter_iter (model, temp_iter))
+        {
+          row += 1;
+          break;
+        }
+
+      filter_next = g_sequence_iter_next (filter_next);
+    }
+
+  if (g_sequence_iter_is_end (filter_next))
+    row += 1;
+
+  /* update the iterator and return it */
+  _clutter_model_iter_set_row (CLUTTER_MODEL_ITER (iter_default), row);
+  iter_default->seq_iter = filter_next;
+
+  return CLUTTER_MODEL_ITER (iter_default);
+}
+
+static ClutterModelIter *
+clutter_list_model_iter_prev (ClutterModelIter *iter)
+{
+  ClutterListModelIter *iter_default;
+  ClutterModelIter *temp_iter;
+  ClutterModel *model;
+  GSequenceIter *filter_prev;
+  guint row;
+
+  iter_default = CLUTTER_LIST_MODEL_ITER (iter);
+  g_assert (iter_default->seq_iter != NULL);
+
+  model = clutter_model_iter_get_model (iter);
+  row   = clutter_model_iter_get_row (iter);
+
+  filter_prev = g_sequence_iter_prev (iter_default->seq_iter);
+  g_assert (filter_prev != NULL);
+
+  temp_iter = CLUTTER_LIST_MODEL (model)->priv->temp_iter;
+
+  while (!g_sequence_iter_is_begin (filter_prev))
+    {
+      CLUTTER_LIST_MODEL_ITER (temp_iter)->seq_iter = filter_prev;
+
+      if (clutter_model_filter_iter (model, temp_iter))
+        {
+          row -= 1;
+          break;
+        }
+
+      filter_prev = g_sequence_iter_prev (filter_prev);
+    }
+
+  if (g_sequence_iter_is_begin (filter_prev))
+    row -= 1;
+
+  /* update the iterator and return it */
+  _clutter_model_iter_set_row (CLUTTER_MODEL_ITER (iter_default), row);
+  iter_default->seq_iter = filter_prev;
+
+  return CLUTTER_MODEL_ITER (iter_default);
+}
+
+static ClutterModelIter *
+clutter_list_model_iter_copy (ClutterModelIter *iter)
+{
+  ClutterListModelIter *iter_default;
+  ClutterListModelIter *iter_copy;
+  ClutterModel *model;
+  guint row;
+ 
+  iter_default = CLUTTER_LIST_MODEL_ITER (iter);
+
+  model = clutter_model_iter_get_model (iter);
+  row   = clutter_model_iter_get_row (iter) - 1;
+
+  iter_copy = g_object_new (CLUTTER_TYPE_LIST_MODEL_ITER,
+                            "model", model,
+                            "row", row,
+                            NULL);
+
+  /* this is safe, because the seq_iter pointer on the passed
+   * iterator will be always be overwritten in ::next or ::prev
+   */
+  iter_copy->seq_iter = iter_default->seq_iter;
+
+  return CLUTTER_MODEL_ITER (iter_copy);
+}
+
+static void
+clutter_list_model_iter_class_init (ClutterListModelIterClass *klass)
+{
+  ClutterModelIterClass *iter_class = CLUTTER_MODEL_ITER_CLASS (klass);
+
+  iter_class->get_value = clutter_list_model_iter_get_value;
+  iter_class->set_value = clutter_list_model_iter_set_value;
+  iter_class->is_first  = clutter_list_model_iter_is_first;
+  iter_class->is_last   = clutter_list_model_iter_is_last;
+  iter_class->next      = clutter_list_model_iter_next;
+  iter_class->prev      = clutter_list_model_iter_prev;
+  iter_class->copy      = clutter_list_model_iter_copy;
+}
+
+static void
+clutter_list_model_iter_init (ClutterListModelIter *iter)
+{
+  iter->seq_iter = NULL;
+}
+
+/*
+ * ClutterListModel
+ */
+
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterListModel, clutter_list_model, CLUTTER_TYPE_MODEL)
+
+static ClutterModelIter *
+clutter_list_model_get_iter_at_row (ClutterModel *model,
+                                    guint         row)
+{
+  ClutterListModel *model_default = CLUTTER_LIST_MODEL (model);
+  GSequence *sequence = model_default->priv->sequence;
+  GSequenceIter *filter_next;
+  gint seq_length = g_sequence_get_length (sequence);
+  ClutterListModelIter *retval;
+  gint count = -1;
+
+  if (row >= seq_length)
+    return NULL;
+
+  retval = g_object_new (CLUTTER_TYPE_LIST_MODEL_ITER,
+                         "model", model,
+                         "row", row,
+                         NULL);
+
+  /* short-circuit in case we don't have a filter in place */
+  if (!clutter_model_get_filter_set (model))
+    {
+      retval->seq_iter = g_sequence_get_iter_at_pos (sequence, row);
+
+      return CLUTTER_MODEL_ITER (retval);
+    }
+
+  filter_next = g_sequence_get_begin_iter (sequence);
+  g_assert (filter_next != NULL);
+
+  while (!g_sequence_iter_is_end (filter_next))
+    {
+      retval->seq_iter = filter_next;
+
+      if (clutter_model_filter_iter (model, CLUTTER_MODEL_ITER (retval)))
+        {
+          /* We've found a row that is valid under the filter */
+          count++;
+          if (count == row)
+            break;
+        }
+
+      filter_next = g_sequence_iter_next (filter_next);
+    }
+
+  if (count != row)
+    {
+      g_object_unref (retval);
+      return NULL;
+    }
+  return CLUTTER_MODEL_ITER (retval);
+}
+
+static ClutterModelIter *
+clutter_list_model_insert_row (ClutterModel *model,
+                               gint          index_)
+{
+  ClutterListModel *model_default = CLUTTER_LIST_MODEL (model);
+  GSequence *sequence = model_default->priv->sequence;
+  ClutterListModelIter *retval;
+  guint n_columns, i, pos;
+  GValue *values;
+  GSequenceIter *seq_iter;
+
+  n_columns = clutter_model_get_n_columns (model);
+  values = g_new0 (GValue, n_columns);
+
+  for (i = 0; i < n_columns; i++)
+    g_value_init (&values[i], clutter_model_get_column_type (model, i));
+
+  if (index_ < 0)
+    {
+      seq_iter = g_sequence_append (sequence, values);
+      pos = g_sequence_get_length (sequence) - 1;
+    }
+  else if (index_ == 0)
+    {
+      seq_iter = g_sequence_prepend (sequence, values);
+      pos = 0;
+    }
+  else
+    {
+      seq_iter = g_sequence_get_iter_at_pos (sequence, index_);
+      seq_iter = g_sequence_insert_before (seq_iter, values);
+      pos = index_;
+    }
+
+  retval = g_object_new (CLUTTER_TYPE_LIST_MODEL_ITER,
+                         "model", model,
+                         "row", pos,
+                         NULL);
+  retval->seq_iter = seq_iter;
+
+  return CLUTTER_MODEL_ITER (retval);
+}
+
+static void
+clutter_list_model_remove_row (ClutterModel *model,
+                               guint         row)
+{
+  ClutterListModel *model_default = CLUTTER_LIST_MODEL (model);
+  GSequence *sequence = model_default->priv->sequence;
+  GSequenceIter *seq_iter;
+  guint pos = 0;
+
+  seq_iter = g_sequence_get_begin_iter (sequence);
+  while (!g_sequence_iter_is_end (seq_iter))
+    {
+      if (clutter_model_filter_row (model, pos))
+        {
+          if (pos == row)
+            {  
+              ClutterModelIter *iter;
+
+              iter = g_object_new (CLUTTER_TYPE_LIST_MODEL_ITER,
+                                   "model", model,
+                                   "row", pos,
+                                   NULL);
+              CLUTTER_LIST_MODEL_ITER (iter)->seq_iter = seq_iter;
+
+              /* the actual row is removed from the sequence inside
+               * the ::row-removed signal class handler, so that every
+               * handler connected to ::row-removed will still get
+               * a valid iterator, and every signal connected to
+               * ::row-removed with the AFTER flag will get an updated
+               * model
+               */
+              g_signal_emit_by_name (model, "row-removed", iter);
+
+              g_object_unref (iter);
+
+              break;
+            }
+        }
+
+      pos += 1;
+      seq_iter = g_sequence_iter_next (seq_iter);
+    }
+}
+
+typedef struct
+{
+  ClutterModel *model;
+  guint column;
+  ClutterModelSortFunc func;
+  gpointer data;
+} SortClosure;
+
+static gint
+sort_model_default (gconstpointer a,
+                    gconstpointer b,
+                    gpointer      data)
+{
+  const GValue *row_a = a;
+  const GValue *row_b = b;
+  SortClosure *clos = data;
+
+  return clos->func (clos->model,
+                     &row_a[clos->column],
+                     &row_b[clos->column],
+                     clos->data);
+}
+
+static void
+clutter_list_model_resort (ClutterModel         *model,
+                           ClutterModelSortFunc  func,
+                           gpointer              data)
+{
+  SortClosure sort_closure = { NULL, 0, NULL, NULL };
+
+  sort_closure.model  = model;
+  sort_closure.column = clutter_model_get_sorting_column (model);
+  sort_closure.func   = func;
+  sort_closure.data   = data;
+
+  g_sequence_sort (CLUTTER_LIST_MODEL (model)->priv->sequence,
+                   sort_model_default,
+                   &sort_closure);
+}
+
+static guint
+clutter_list_model_get_n_rows (ClutterModel *model)
+{
+  ClutterListModel *list_model = CLUTTER_LIST_MODEL (model);
+
+  /* short-circuit in case we don't have a filter in place */
+  if (!clutter_model_get_filter_set (model))
+    return g_sequence_get_length (list_model->priv->sequence);
+
+  return CLUTTER_MODEL_CLASS (clutter_list_model_parent_class)->get_n_rows (model);
+}
+
+static void
+clutter_list_model_row_removed (ClutterModel     *model,
+                                ClutterModelIter *iter)
+{
+  ClutterListModelIter *iter_default;
+  guint i, n_columns;
+  GValue *values;
+
+  n_columns = clutter_model_get_n_columns (model);
+
+  iter_default = CLUTTER_LIST_MODEL_ITER (iter);
+
+  values = g_sequence_get (iter_default->seq_iter);
+
+  for (i = 0; i < n_columns; i++)
+    g_value_unset (&values[i]);
+
+  g_free (values);
+
+  g_sequence_remove (iter_default->seq_iter);
+  iter_default->seq_iter = NULL;
+}
+
+static void
+clutter_list_model_finalize (GObject *gobject)
+{
+  ClutterListModel *model = CLUTTER_LIST_MODEL (gobject);
+  GSequence *sequence = model->priv->sequence;
+  GSequenceIter *iter;
+  guint n_columns, i;
+
+  n_columns = clutter_model_get_n_columns (CLUTTER_MODEL (gobject));
+
+  iter = g_sequence_get_begin_iter (sequence);
+  while (!g_sequence_iter_is_end (iter))
+    {
+      GValue *values = g_sequence_get (iter);
+
+      for (i = 0; i < n_columns; i++)
+        g_value_unset (&values[i]);
+
+      g_free (values);
+
+      iter = g_sequence_iter_next (iter);
+    }
+  g_sequence_free (sequence);
+
+  G_OBJECT_CLASS (clutter_list_model_parent_class)->finalize (gobject);
+}
+
+static void
+clutter_list_model_dispose (GObject *gobject)
+{
+  ClutterListModel *model = CLUTTER_LIST_MODEL (gobject);
+
+  if (model->priv->temp_iter)
+    {
+      g_object_unref (model->priv->temp_iter);
+      model->priv->temp_iter = NULL;
+    }
+
+  G_OBJECT_CLASS (clutter_list_model_parent_class)->dispose (gobject);
+}
+
+static void
+clutter_list_model_class_init (ClutterListModelClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  ClutterModelClass *model_class = CLUTTER_MODEL_CLASS (klass);
+
+  gobject_class->finalize = clutter_list_model_finalize;
+  gobject_class->dispose = clutter_list_model_dispose;
+
+  model_class->get_iter_at_row = clutter_list_model_get_iter_at_row;
+  model_class->insert_row = clutter_list_model_insert_row;
+  model_class->remove_row = clutter_list_model_remove_row;
+  model_class->resort = clutter_list_model_resort;
+  model_class->get_n_rows = clutter_list_model_get_n_rows;
+  model_class->row_removed = clutter_list_model_row_removed;
+}
+
+static void
+clutter_list_model_init (ClutterListModel *model)
+{
+  model->priv = clutter_list_model_get_instance_private (model);
+
+  model->priv->sequence = g_sequence_new (NULL);
+  model->priv->temp_iter = g_object_new (CLUTTER_TYPE_LIST_MODEL_ITER,
+                                         "model",
+                                         model,
+                                         NULL);
+}
+
+/**
+ * clutter_list_model_new:
+ * @n_columns: number of columns in the model
+ * @...: @n_columns number of #GType and string pairs
+ *
+ * Creates a new default model with @n_columns columns with the types 
+ * and names passed in.
+ *
+ * For example:
+ * 
+ * <informalexample><programlisting>
+ * model = clutter_list_model_new (3,
+ *                                 G_TYPE_INT,      "Score",
+ *                                 G_TYPE_STRING,   "Team",
+ *                                 GDK_TYPE_PIXBUF, "Logo");
+ * </programlisting></informalexample>
+ *
+ * will create a new #ClutterModel with three columns of type int,
+ * string and #GdkPixbuf respectively.
+ *
+ * Note that the name of the column can be set to %NULL, in which case
+ * the canonical name of the type held by the column will be used as
+ * the title.
+ *
+ * Return value: a new #ClutterListModel
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListStore instead
+ */
+ClutterModel *
+clutter_list_model_new (guint n_columns,
+                        ...)
+{
+  ClutterModel *model;
+  va_list args;
+  gint i;
+
+  g_return_val_if_fail (n_columns > 0, NULL);
+
+  model = g_object_new (CLUTTER_TYPE_LIST_MODEL, NULL);
+  _clutter_model_set_n_columns (model, n_columns, TRUE, TRUE);
+
+  va_start (args, n_columns);
+
+  for (i = 0; i < n_columns; i++)
+    { 
+      GType type = va_arg (args, GType);
+      const gchar *name = va_arg (args, gchar*);
+
+      if (!_clutter_model_check_type (type))
+        {
+          g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (type));
+          g_object_unref (model);
+          model = NULL;
+          goto out;
+        }
+
+      _clutter_model_set_column_type (model, i, type);
+      _clutter_model_set_column_name (model, i, name);
+    }
+
+ out:
+  va_end (args);
+  return model;
+}
+
+/**
+ * clutter_list_model_newv:
+ * @n_columns: number of columns in the model
+ * @types: (array length=n_columns): an array of #GType types for the columns, from first to last
+ * @names: (array length=n_columns): an array of names for the columns, from first to last
+ *
+ * Non-vararg version of clutter_list_model_new(). This function is
+ * useful for language bindings.
+ *
+ * Return value: (transfer full): a new default #ClutterModel
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListStore instead
+ */
+ClutterModel *
+clutter_list_model_newv (guint                n_columns,
+                         GType               *types,
+                         const gchar * const  names[])
+{
+  ClutterModel *model;
+  gint i;
+
+  g_return_val_if_fail (n_columns > 0, NULL);
+
+  model = g_object_new (CLUTTER_TYPE_LIST_MODEL, NULL);
+  _clutter_model_set_n_columns (model, n_columns, TRUE, TRUE);
+
+  for (i = 0; i < n_columns; i++)
+    {
+      if (!_clutter_model_check_type (types[i]))
+        {
+          g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (types[i]));
+          g_object_unref (model);
+          return NULL;
+        }
+
+      _clutter_model_set_column_type (model, i, types[i]);
+      _clutter_model_set_column_name (model, i, names[i]);
+    }
+
+  return model;
+}
--- a/clutter/clutter/deprecated/clutter-list-model.h
+++ b/clutter/clutter/deprecated/clutter-list-model.h
@@ -0,0 +1,95 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *             Neil Jagdish Patel <njp@o-hand.com>
+ *             Emmanuele Bassi <ebassi@openedhand.com>
+ *
+ * Copyright (C) 2006 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * NB: Inspiration for column storage taken from GtkListStore
+ */
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_LIST_MODEL_H__
+#define __CLUTTER_LIST_MODEL_H__
+
+#include <clutter/deprecated/clutter-model.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_TYPE_LIST_MODEL                 (clutter_list_model_get_type ())
+#define CLUTTER_LIST_MODEL(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_LIST_MODEL, ClutterListModel))
+#define CLUTTER_IS_LIST_MODEL(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_LIST_MODEL))
+#define CLUTTER_LIST_MODEL_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_LIST_MODEL, ClutterListModeClass))
+#define CLUTTER_IS_LIST_MODEL_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_LIST_MODEL))
+#define CLUTTER_LIST_MODEL_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_LIST_MODEL, ClutterListModeClass))
+
+typedef struct _ClutterListModel                ClutterListModel;
+typedef struct _ClutterListModelPrivate         ClutterListModelPrivate;
+typedef struct _ClutterListModelClass           ClutterListModelClass;
+
+/**
+ * ClutterListModel:
+ *
+ * The #ClutterListModel struct contains only private data.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListStore instead
+ */
+struct _ClutterListModel
+{
+  /*< private >*/
+  ClutterModel parent_instance;
+
+  ClutterListModelPrivate *priv;
+};
+
+/**
+ * ClutterListModelClass:
+ *
+ * The #ClutterListModelClass struct contains only private data.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListStore instead
+ */
+struct _ClutterListModelClass
+{
+  /*< private >*/
+  ClutterModelClass parent_class;
+};
+
+CLUTTER_DEPRECATED_FOR(g_list_store_get_type)
+GType         clutter_list_model_get_type (void) G_GNUC_CONST;
+
+CLUTTER_DEPRECATED_FOR(g_list_store_new)
+ClutterModel *clutter_list_model_new      (guint                n_columns,
+                                              ...);
+CLUTTER_DEPRECATED_FOR(g_list_store_new)
+ClutterModel *clutter_list_model_newv     (guint                n_columns,
+                                           GType               *types,
+                                           const gchar * const  names[]);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_LIST_MODEL_H__ */
--- a/clutter/clutter/deprecated/clutter-model-private.h
+++ b/clutter/clutter/deprecated/clutter-model-private.h
@@ -0,0 +1,52 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *             Neil Jagdish Patel <njp@o-hand.com>
+ *             Emmanuele Bassi <ebassi@openedhand.com>
+ *
+ * Copyright (C) 2006 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CLUTTER_MODEL_PRIVATE_H__
+#define __CLUTTER_MODEL_PRIVATE_H__
+
+#include "clutter-types.h"
+#include "clutter-model.h"
+
+G_BEGIN_DECLS
+
+void            _clutter_model_set_n_columns    (ClutterModel *model,
+                                                 gint          n_columns,
+                                                 gboolean      set_types,
+                                                 gboolean      set_names);
+gboolean        _clutter_model_check_type       (GType         gtype);
+
+void            _clutter_model_set_column_type  (ClutterModel *model,
+                                                 gint          column,
+                                                 GType         gtype);
+void            _clutter_model_set_column_name  (ClutterModel *model,
+                                                 gint          column,
+                                                 const gchar  *name);
+
+void            _clutter_model_iter_set_row     (ClutterModelIter *iter,
+                                                 guint             row);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_MODEL_PRIVATE_H__ */
--- a/clutter/clutter/deprecated/clutter-model.c
+++ b/clutter/clutter/deprecated/clutter-model.c
--- a/clutter/clutter/deprecated/clutter-model.h
+++ b/clutter/clutter/deprecated/clutter-model.h
@@ -0,0 +1,436 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *             Neil Jagdish Patel <njp@o-hand.com>
+ *             Emmanuele Bassi <ebassi@openedhand.com>
+ *
+ * Copyright (C) 2006 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_MODEL_H__
+#define __CLUTTER_MODEL_H__
+
+#include <clutter/clutter-types.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_TYPE_MODEL              (clutter_model_get_type ())
+#define CLUTTER_MODEL(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_MODEL, ClutterModel))
+#define CLUTTER_MODEL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_MODEL, ClutterModelClass))
+#define CLUTTER_IS_MODEL(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_MODEL))
+#define CLUTTER_IS_MODEL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_MODEL))
+#define CLUTTER_MODEL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_MODEL, ClutterModelClass))
+
+typedef struct _ClutterModel            ClutterModel;
+typedef struct _ClutterModelClass       ClutterModelClass;
+typedef struct _ClutterModelPrivate     ClutterModelPrivate;
+typedef struct _ClutterModelIter        ClutterModelIter;
+typedef struct _ClutterModelIterClass   ClutterModelIterClass;
+typedef struct _ClutterModelIterPrivate ClutterModelIterPrivate;
+
+
+/**
+ * ClutterModelFilterFunc:
+ * @model: a #ClutterModel
+ * @iter: the iterator for the row
+ * @user_data: data passed to clutter_model_set_filter()
+ *
+ * Filters the content of a row in the model.
+ *
+ * Return value: If the row should be displayed, return %TRUE
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Implement filters using a custom #GListModel instead
+ */
+typedef gboolean (*ClutterModelFilterFunc) (ClutterModel     *model,
+                                            ClutterModelIter *iter,
+                                            gpointer          user_data);
+
+/**
+ * ClutterModelSortFunc:
+ * @model: a #ClutterModel
+ * @a: a #GValue representing the contents of the row
+ * @b: a #GValue representing the contents of the second row
+ * @user_data: data passed to clutter_model_set_sort()
+ *
+ * Compares the content of two rows in the model.
+ *
+ * Return value: a positive integer if @a is after @b, a negative integer if
+ *   @a is before @b, or 0 if the rows are the same
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Implement sorting using a custom #GListModel instead
+ */
+typedef gint (*ClutterModelSortFunc) (ClutterModel *model,
+                                      const GValue *a,
+                                      const GValue *b,
+                                      gpointer      user_data);
+
+/**
+ * ClutterModelForeachFunc:
+ * @model: a #ClutterModel
+ * @iter: the iterator for the row
+ * @user_data: data passed to clutter_model_foreach()
+ *
+ * Iterates on the content of a row in the model
+ *
+ * Return value: %TRUE if the iteration should continue, %FALSE otherwise
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListModel
+ */
+typedef gboolean (*ClutterModelForeachFunc) (ClutterModel     *model,
+                                             ClutterModelIter *iter,
+                                             gpointer          user_data);
+
+/**
+ * ClutterModel:
+ *
+ * Base class for list models. The #ClutterModel structure contains
+ * only private data and should be manipulated using the provided
+ * API.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListModel instead
+ */
+struct _ClutterModel
+{
+  /*< private >*/
+  GObject parent_instance;
+
+  ClutterModelPrivate *priv;
+};
+
+/**
+ * ClutterModelClass:
+ * @row_added: signal class handler for ClutterModel::row-added
+ * @row_removed: signal class handler for ClutterModel::row-removed
+ * @row_changed: signal class handler for ClutterModel::row-changed
+ * @sort_changed: signal class handler for ClutterModel::sort-changed
+ * @filter_changed: signal class handler for ClutterModel::filter-changed
+ * @get_column_name: virtual function for returning the name of a column
+ * @get_column_type: virtual function for returning the type of a column
+ * @get_iter_at_row: virtual function for returning an iterator for the
+ *   given row
+ * @get_n_rows: virtual function for returning the number of rows
+ *   of the model
+ * @get_n_columns: virtual function for retuning the number of columns
+ *   of the model
+ * @resort: virtual function for sorting the model using the passed
+ *   sorting function
+ * @insert_row: virtual function for inserting a row at the given index
+ *   and returning an iterator pointing to it; if the index is a negative
+ *   integer, the row should be appended to the model
+ * @remove_row: virtual function for removing a row at the given index
+ *
+ * Class for #ClutterModel instances.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListModel instead
+ */
+struct _ClutterModelClass 
+{
+  /*< private >*/
+  GObjectClass parent_class;
+
+  /*< public >*/
+  /* vtable */
+  guint             (* get_n_rows)      (ClutterModel         *model);
+  guint             (* get_n_columns)   (ClutterModel         *model);
+  const gchar *     (* get_column_name) (ClutterModel         *model,
+                                         guint                 column);
+  GType             (* get_column_type) (ClutterModel         *model,
+                                         guint                 column);
+  ClutterModelIter *(* insert_row)      (ClutterModel         *model,
+                                         gint                  index_);
+  void              (* remove_row)      (ClutterModel         *model,
+                                         guint                 row);
+  ClutterModelIter *(* get_iter_at_row) (ClutterModel         *model,
+                                         guint                 row);
+  void              (* resort)          (ClutterModel         *model,
+                                         ClutterModelSortFunc  func,
+                                         gpointer              data);
+
+  /* signals */
+  void              (* row_added)       (ClutterModel     *model,
+                                         ClutterModelIter *iter);
+  void              (* row_removed)     (ClutterModel     *model,
+                                         ClutterModelIter *iter);
+  void              (* row_changed)     (ClutterModel     *model,
+                                         ClutterModelIter *iter);
+  void              (* sort_changed)    (ClutterModel     *model);
+  void              (* filter_changed)  (ClutterModel     *model);
+
+  /*< private >*/
+  /* padding for future expansion */
+  void (*_clutter_model_1) (void);
+  void (*_clutter_model_2) (void);
+  void (*_clutter_model_3) (void);
+  void (*_clutter_model_4) (void);
+  void (*_clutter_model_5) (void);
+  void (*_clutter_model_6) (void);
+  void (*_clutter_model_7) (void);
+  void (*_clutter_model_8) (void);
+};
+
+CLUTTER_DEPRECATED_FOR(g_list_model_get_type)
+GType                 clutter_model_get_type           (void) G_GNUC_CONST;
+
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_set_types          (ClutterModel     *model,
+                                                        guint             n_columns,
+                                                        GType            *types);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_set_names          (ClutterModel     *model,
+                                                        guint             n_columns,
+                                                        const gchar * const names[]);
+
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_append             (ClutterModel     *model,
+                                                        ...);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_appendv            (ClutterModel     *model,
+                                                        guint             n_columns,
+                                                        guint            *columns,
+                                                        GValue           *values);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_prepend            (ClutterModel     *model,
+                                                        ...);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_prependv           (ClutterModel     *model,
+                                                        guint             n_columns,
+                                                        guint            *columns,
+                                                        GValue           *values);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_insert             (ClutterModel     *model,
+                                                        guint             row,
+                                                        ...);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_insertv            (ClutterModel     *model,
+                                                        guint             row,
+                                                        guint             n_columns,
+                                                        guint            *columns,
+                                                        GValue           *values);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_insert_value       (ClutterModel     *model,
+                                                        guint             row,
+                                                        guint             column,
+                                                        const GValue     *value);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_remove             (ClutterModel     *model,
+                                                        guint             row);
+
+CLUTTER_DEPRECATED_FOR(GListModel)
+guint                 clutter_model_get_n_rows         (ClutterModel     *model);
+CLUTTER_DEPRECATED_FOR(GListModel)
+guint                 clutter_model_get_n_columns      (ClutterModel     *model);
+CLUTTER_DEPRECATED_FOR(GListModel)
+const gchar *         clutter_model_get_column_name    (ClutterModel     *model,
+                                                        guint             column);
+CLUTTER_DEPRECATED_FOR(GListModel)
+GType                 clutter_model_get_column_type    (ClutterModel     *model,
+                                                        guint             column);
+
+CLUTTER_DEPRECATED_FOR(GListModel)
+ClutterModelIter *    clutter_model_get_first_iter     (ClutterModel     *model);
+CLUTTER_DEPRECATED_FOR(GListModel)
+ClutterModelIter *    clutter_model_get_last_iter      (ClutterModel     *model);
+CLUTTER_DEPRECATED_FOR(GListModel)
+ClutterModelIter *    clutter_model_get_iter_at_row    (ClutterModel     *model,
+                                                        guint             row);
+
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_set_sorting_column (ClutterModel     *model,
+                                                        gint              column);
+CLUTTER_DEPRECATED_FOR(GListModel)
+gint                  clutter_model_get_sorting_column (ClutterModel     *model);
+
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_foreach            (ClutterModel     *model,
+                                                        ClutterModelForeachFunc func, 
+                                                        gpointer          user_data);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_set_sort           (ClutterModel     *model, 
+                                                        gint              column,
+                                                        ClutterModelSortFunc func, 
+                                                        gpointer          user_data,
+                                                        GDestroyNotify    notify);
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_set_filter         (ClutterModel     *model, 
+                                                        ClutterModelFilterFunc func, 
+                                                        gpointer          user_data,
+                                                        GDestroyNotify    notify);
+CLUTTER_DEPRECATED_FOR(GListModel)
+gboolean              clutter_model_get_filter_set     (ClutterModel     *model);
+
+CLUTTER_DEPRECATED_FOR(GListModel)
+void                  clutter_model_resort             (ClutterModel     *model);
+CLUTTER_DEPRECATED_FOR(GListModel)
+gboolean              clutter_model_filter_row         (ClutterModel     *model,
+                                                        guint             row);
+CLUTTER_DEPRECATED_FOR(GListModel)
+gboolean              clutter_model_filter_iter        (ClutterModel     *model,
+                                                        ClutterModelIter *iter);
+
+/*
+ * ClutterModelIter 
+ */
+
+#define CLUTTER_TYPE_MODEL_ITER                 (clutter_model_iter_get_type ())
+#define CLUTTER_MODEL_ITER(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_MODEL_ITER, ClutterModelIter))
+#define CLUTTER_MODEL_ITER_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_MODEL_ITER, ClutterModelIterClass))
+#define CLUTTER_IS_MODEL_ITER(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_MODEL_ITER))
+#define CLUTTER_IS_MODEL_ITER_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_MODEL_ITER))
+#define CLUTTER_MODEL_ITER_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_MODEL_ITER, ClutterModelIterClass))
+
+/**
+ * ClutterModelIter:
+ *
+ * Base class for list models iters. The #ClutterModelIter structure
+ * contains only private data and should be manipulated using the
+ * provided API.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use custom iterators for #GListModel
+ */
+struct _ClutterModelIter
+{
+  /*< private >*/
+  GObject parent_instance;
+
+  ClutterModelIterPrivate *priv;
+};
+
+/**
+ * ClutterModelIterClass:
+ * @get_value: Virtual function for retrieving the value at the given
+ *   column of the row pointed by the iterator
+ * @set_value: Virtual function for setting the value at the given
+ *   column of the row pointer by the iterator
+ * @is_last: Virtual function for knowing whether the iterator points
+ *   at the last row in the model
+ * @is_first: Virtual function for knowing whether the iterator points
+ *   at the first row in the model
+ * @next: Virtual function for moving the iterator to the following
+ *   row in the model
+ * @prev: Virtual function for moving the iterator toe the previous
+ *   row in the model
+ * @get_model: Virtual function for getting the model to which the
+ *   iterator belongs to
+ * @get_row: Virtual function for getting the row to which the iterator
+ *   points
+ * @copy: Virtual function for copying a #ClutterModelIter.
+ *
+ * Class for #ClutterModelIter instances.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.24: Use custom iterators for #GListModel
+ */
+struct _ClutterModelIterClass 
+{
+  /*< private >*/
+  GObjectClass parent_class;
+
+  /*< public >*/
+  /* vtable not signals */
+  void              (* get_value) (ClutterModelIter *iter, 
+                                   guint             column, 
+                                   GValue           *value);
+  void              (* set_value) (ClutterModelIter *iter, 
+                                   guint             column, 
+                                   const GValue     *value);
+
+  gboolean          (* is_first)  (ClutterModelIter *iter);
+  gboolean          (* is_last)   (ClutterModelIter *iter);
+
+  ClutterModelIter *(* next)      (ClutterModelIter *iter);
+  ClutterModelIter *(* prev)      (ClutterModelIter *iter);
+
+  ClutterModel *    (* get_model) (ClutterModelIter *iter);
+  guint             (* get_row)   (ClutterModelIter *iter);
+
+  ClutterModelIter *(* copy)      (ClutterModelIter *iter);
+
+  /*< private >*/
+  /* padding for future expansion */
+  void (*_clutter_model_iter_1) (void);
+  void (*_clutter_model_iter_2) (void);
+  void (*_clutter_model_iter_3) (void);
+  void (*_clutter_model_iter_4) (void);
+  void (*_clutter_model_iter_5) (void);
+  void (*_clutter_model_iter_6) (void);
+  void (*_clutter_model_iter_7) (void);
+  void (*_clutter_model_iter_8) (void);
+};
+
+CLUTTER_DEPRECATED
+GType             clutter_model_iter_get_type   (void) G_GNUC_CONST;
+
+CLUTTER_DEPRECATED
+void              clutter_model_iter_get        (ClutterModelIter *iter,
+                                                 ...);
+CLUTTER_DEPRECATED
+void              clutter_model_iter_get_valist (ClutterModelIter *iter,
+                                                 va_list          args);
+CLUTTER_DEPRECATED
+void              clutter_model_iter_get_value  (ClutterModelIter *iter,
+                                                 guint             column,
+                                                 GValue           *value);
+CLUTTER_DEPRECATED
+void              clutter_model_iter_set        (ClutterModelIter *iter,
+                                                 ...);
+CLUTTER_DEPRECATED
+void              clutter_model_iter_set_valist (ClutterModelIter *iter,
+                                                 va_list          args);
+CLUTTER_DEPRECATED
+void              clutter_model_iter_set_value  (ClutterModelIter *iter,
+                                                 guint             column,
+                                                 const GValue     *value);
+
+CLUTTER_DEPRECATED
+gboolean          clutter_model_iter_is_first   (ClutterModelIter *iter);
+CLUTTER_DEPRECATED
+gboolean          clutter_model_iter_is_last    (ClutterModelIter *iter);
+CLUTTER_DEPRECATED
+ClutterModelIter *clutter_model_iter_next       (ClutterModelIter *iter);
+CLUTTER_DEPRECATED
+ClutterModelIter *clutter_model_iter_prev       (ClutterModelIter *iter);
+
+CLUTTER_DEPRECATED
+ClutterModel *    clutter_model_iter_get_model  (ClutterModelIter *iter);
+CLUTTER_DEPRECATED
+guint             clutter_model_iter_get_row    (ClutterModelIter *iter);
+
+CLUTTER_DEPRECATED
+ClutterModelIter *clutter_model_iter_copy       (ClutterModelIter *iter);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_MODEL_H__ */
--- a/clutter/clutter/deprecated/clutter-shader.c
+++ b/clutter/clutter/deprecated/clutter-shader.c
@@ -0,0 +1,907 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By: Matthew Allum   <mallum@openedhand.com>
+ *              Øyvind Kolås    <pippin@o-hand.com>
+ *              Emmanuele Bassi <ebassi@linux.intel.com>
+ *
+ * Copyright (C) 2007, 2008 OpenedHand
+ * Copyright (C) 2009 Intel Corp
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
+/**
+ * SECTION:clutter-shader
+ * @short_description: Programmable pipeline abstraction
+ *
+ * #ClutterShader is an object providing an abstraction over the
+ * OpenGL programmable pipeline. By using #ClutterShader<!-- -->s is
+ * possible to override the drawing pipeline by using small programs
+ * also known as "shaders".
+ *
+ * #ClutterShader is available since Clutter 0.6.
+ *
+ * #ClutterShader is deprecated since Clutter 1.8; use #ClutterShaderEffect
+ * in newly written code, instead.
+ */
+
+#include "clutter-build-config.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
+#include <glib.h>
+
+#include <cogl/cogl.h>
+
+#include "clutter-shader.h"
+
+#include "clutter-debug.h"
+#include "clutter-private.h"
+
+/* global list of shaders */
+static GList *clutter_shaders_list = NULL;
+
+struct _ClutterShaderPrivate
+{
+  guint       compiled         : 1; /* Shader is bound to the GL context */
+  guint       is_enabled       : 1;
+
+  gchar      *vertex_source;        /* GLSL source for vertex shader */
+  gchar      *fragment_source;      /* GLSL source for fragment shader */
+
+  CoglHandle  program;
+
+  CoglHandle  vertex_shader;
+  CoglHandle  fragment_shader;
+};
+
+enum
+{
+  PROP_0,
+
+  PROP_VERTEX_SOURCE,
+  PROP_FRAGMENT_SOURCE,
+  PROP_COMPILED,
+  PROP_ENABLED,
+
+  PROP_LAST
+};
+
+static GParamSpec *obj_props[PROP_LAST];
+
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterShader, clutter_shader, G_TYPE_OBJECT)
+
+static inline void
+clutter_shader_release_internal (ClutterShader *shader)
+{
+  ClutterShaderPrivate *priv = shader->priv;
+
+  if (!priv->compiled)
+    return;
+
+  g_assert (priv->program != COGL_INVALID_HANDLE);
+
+  if (priv->vertex_shader != COGL_INVALID_HANDLE)
+    cogl_handle_unref (priv->vertex_shader);
+
+  if (priv->fragment_shader != COGL_INVALID_HANDLE)
+    cogl_handle_unref (priv->fragment_shader);
+
+  if (priv->program != COGL_INVALID_HANDLE)
+    cogl_handle_unref (priv->program);
+
+  priv->vertex_shader = COGL_INVALID_HANDLE;
+  priv->fragment_shader = COGL_INVALID_HANDLE;
+  priv->program = COGL_INVALID_HANDLE;
+  priv->compiled = FALSE;
+}
+
+static void
+clutter_shader_finalize (GObject *object)
+{
+  ClutterShader        *shader;
+  ClutterShaderPrivate *priv;
+
+  shader = CLUTTER_SHADER (object);
+  priv   = shader->priv;
+
+  clutter_shaders_list = g_list_remove (clutter_shaders_list, object);
+
+  g_free (priv->fragment_source);
+  g_free (priv->vertex_source);
+
+  G_OBJECT_CLASS (clutter_shader_parent_class)->finalize (object);
+}
+
+static void
+clutter_shader_dispose (GObject *object)
+{
+  ClutterShader *shader = CLUTTER_SHADER (object);
+
+  clutter_shader_release_internal (shader);
+
+  G_OBJECT_CLASS (clutter_shader_parent_class)->finalize (object);
+}
+
+static void
+clutter_shader_set_property (GObject      *object,
+                             guint         prop_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  ClutterShader *shader = CLUTTER_SHADER(object);
+
+  switch (prop_id)
+    {
+    case PROP_VERTEX_SOURCE:
+      clutter_shader_set_vertex_source (shader,
+					g_value_get_string (value), -1);
+      break;
+    case PROP_FRAGMENT_SOURCE:
+      clutter_shader_set_fragment_source (shader,
+					  g_value_get_string (value), -1);
+      break;
+    case PROP_ENABLED:
+      clutter_shader_set_is_enabled (shader, g_value_get_boolean (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+clutter_shader_get_property (GObject    *object,
+                             guint       prop_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  ClutterShader        *shader;
+  ClutterShaderPrivate *priv;
+
+  shader = CLUTTER_SHADER(object);
+  priv = shader->priv;
+
+  switch (prop_id)
+    {
+    case PROP_VERTEX_SOURCE:
+      g_value_set_string (value, priv->vertex_source);
+      break;
+    case PROP_FRAGMENT_SOURCE:
+      g_value_set_string (value, priv->fragment_source);
+      break;
+    case PROP_COMPILED:
+      g_value_set_boolean (value, priv->compiled);
+      break;
+    case PROP_ENABLED:
+      g_value_set_boolean (value, priv->is_enabled);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static GObject *
+clutter_shader_constructor (GType                  type,
+                            guint                  n_params,
+                            GObjectConstructParam *params)
+{
+  GObjectClass *parent_class;
+  GObject *object;
+
+  parent_class = G_OBJECT_CLASS (clutter_shader_parent_class);
+  object = parent_class->constructor (type, n_params, params);
+
+  /* add this instance to the global list of shaders */
+  clutter_shaders_list = g_list_prepend (clutter_shaders_list, object);
+
+  return object;
+}
+
+static void
+clutter_shader_class_init (ClutterShaderClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GParamSpec *pspec = NULL;
+
+  object_class->finalize      = clutter_shader_finalize;
+  object_class->dispose       = clutter_shader_dispose;
+  object_class->set_property  = clutter_shader_set_property;
+  object_class->get_property  = clutter_shader_get_property;
+  object_class->constructor   = clutter_shader_constructor;
+
+  /**
+   * ClutterShader:vertex-source:
+   *
+   * GLSL source code for the vertex shader part of the shader
+   * program, if any
+   *
+   * Since: 0.6
+   *
+   * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+   */
+  pspec = g_param_spec_string ("vertex-source",
+                               P_("Vertex Source"),
+                               P_("Source of vertex shader"),
+                               NULL,
+                               CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_VERTEX_SOURCE] = pspec;
+  g_object_class_install_property (object_class, PROP_VERTEX_SOURCE, pspec);
+
+  /**
+   * ClutterShader:fragment-source:
+   *
+   * GLSL source code for the fragment shader part of the shader program.
+   *
+   * Since: 0.6
+   *
+   * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+   */
+  pspec = g_param_spec_string ("fragment-source",
+                               P_("Fragment Source"),
+                               P_("Source of fragment shader"),
+                               NULL,
+                               CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_FRAGMENT_SOURCE] = pspec;
+  g_object_class_install_property (object_class, PROP_FRAGMENT_SOURCE, pspec);
+
+  /**
+   * ClutterShader:compiled:
+   *
+   * Whether the shader is compiled and linked, ready for use
+   * in the GL context.
+   *
+   * Since: 0.8
+   *
+   * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+   */
+  pspec = g_param_spec_boolean ("compiled",
+                                P_("Compiled"),
+                                P_("Whether the shader is compiled and linked"),
+                                FALSE,
+                                CLUTTER_PARAM_READABLE);
+  obj_props[PROP_COMPILED] = pspec;
+  g_object_class_install_property (object_class, PROP_COMPILED, pspec);
+
+  /**
+   * ClutterShader:enabled:
+   *
+   * Whether the shader is currently used in the GL rendering pipeline.
+   *
+   * Since: 0.6
+   *
+   * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+   */
+  pspec = g_param_spec_boolean ("enabled",
+                                P_("Enabled"),
+                                P_("Whether the shader is enabled"),
+                                FALSE,
+                                CLUTTER_PARAM_READWRITE);
+  obj_props[PROP_ENABLED] = pspec;
+  g_object_class_install_property (object_class, PROP_ENABLED, pspec);
+}
+
+static void
+clutter_shader_init (ClutterShader *self)
+{
+  ClutterShaderPrivate *priv;
+
+  priv = self->priv = clutter_shader_get_instance_private (self);
+
+  priv->compiled = FALSE;
+
+  priv->vertex_source = NULL;
+  priv->fragment_source = NULL;
+
+  priv->program = COGL_INVALID_HANDLE;
+  priv->vertex_shader = COGL_INVALID_HANDLE;
+  priv->fragment_shader = COGL_INVALID_HANDLE;
+}
+
+/**
+ * clutter_shader_new:
+ *
+ * Create a new #ClutterShader instance.
+ *
+ * Return value: a new #ClutterShader.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+ClutterShader *
+clutter_shader_new (void)
+{
+  return g_object_new (CLUTTER_TYPE_SHADER, NULL);
+}
+
+static inline void
+clutter_shader_set_source (ClutterShader     *shader,
+                           ClutterShaderType  shader_type,
+                           const gchar       *data,
+                           gssize             length)
+{
+  ClutterShaderPrivate *priv = shader->priv;
+
+  if (length < 0)
+    length = strlen (data);
+
+  g_object_freeze_notify (G_OBJECT (shader));
+
+  /* release shader if bound when changing the source, the shader will
+   * automatically be rebound on the next use.
+   */
+  if (clutter_shader_is_compiled (shader))
+    clutter_shader_release (shader);
+
+  CLUTTER_NOTE (SHADER,
+                "setting %s shader (len:%" G_GSSIZE_FORMAT ")",
+                shader_type == CLUTTER_VERTEX_SHADER ? "vertex" : "fragment",
+                length);
+
+  switch (shader_type)
+    {
+    case CLUTTER_FRAGMENT_SHADER:
+      g_free (priv->fragment_source);
+
+      priv->fragment_source = g_strndup (data, length);
+      g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_FRAGMENT_SOURCE]);
+      break;
+
+    case CLUTTER_VERTEX_SHADER:
+      g_free (priv->vertex_source);
+
+      priv->vertex_source = g_strndup (data, length);
+      g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_VERTEX_SOURCE]);
+      break;
+    }
+
+  g_object_thaw_notify (G_OBJECT (shader));
+}
+
+/**
+ * clutter_shader_set_fragment_source:
+ * @shader: a #ClutterShader
+ * @data: GLSL source code.
+ * @length: length of source buffer (currently ignored)
+ *
+ * Sets the GLSL source code to be used by a #ClutterShader for the fragment
+ * program.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+void
+clutter_shader_set_fragment_source (ClutterShader      *shader,
+                                    const gchar        *data,
+                                    gssize              length)
+{
+  g_return_if_fail (CLUTTER_IS_SHADER (shader));
+  g_return_if_fail (data != NULL);
+
+  clutter_shader_set_source (shader, CLUTTER_FRAGMENT_SHADER, data, length);
+}
+
+/**
+ * clutter_shader_set_vertex_source:
+ * @shader: a #ClutterShader
+ * @data: GLSL source code.
+ * @length: length of source buffer (currently ignored)
+ *
+ * Sets the GLSL source code to be used by a #ClutterShader for the vertex
+ * program.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+void
+clutter_shader_set_vertex_source (ClutterShader      *shader,
+                                  const gchar        *data,
+                                  gssize              length)
+{
+  g_return_if_fail (CLUTTER_IS_SHADER (shader));
+  g_return_if_fail (data != NULL);
+
+  clutter_shader_set_source (shader, CLUTTER_VERTEX_SHADER, data, length);
+}
+
+static const gchar *
+clutter_shader_get_source (ClutterShader     *shader,
+                           ClutterShaderType  shader_type)
+{
+  switch (shader_type)
+    {
+    case CLUTTER_FRAGMENT_SHADER:
+      return shader->priv->fragment_source;
+
+    case CLUTTER_VERTEX_SHADER:
+      return shader->priv->vertex_source;
+    }
+
+  return NULL;
+}
+
+static CoglHandle
+clutter_shader_get_cogl_shader (ClutterShader     *shader,
+                                ClutterShaderType  shader_type)
+{
+  switch (shader_type)
+    {
+    case CLUTTER_FRAGMENT_SHADER:
+      return shader->priv->fragment_shader;
+
+    case CLUTTER_VERTEX_SHADER:
+      return shader->priv->vertex_shader;
+    }
+
+  return COGL_INVALID_HANDLE;
+}
+
+static gboolean
+clutter_shader_glsl_bind (ClutterShader      *self,
+                          ClutterShaderType   shader_type,
+                          GError            **error)
+{
+  ClutterShaderPrivate *priv = self->priv;
+  CoglHandle shader = COGL_INVALID_HANDLE;
+
+  switch (shader_type)
+    {
+    case CLUTTER_VERTEX_SHADER:
+      shader = cogl_create_shader (COGL_SHADER_TYPE_VERTEX);
+      cogl_shader_source (shader, priv->vertex_source);
+
+      priv->vertex_shader = shader;
+      break;
+
+    case CLUTTER_FRAGMENT_SHADER:
+      shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);
+      cogl_shader_source (shader, priv->fragment_source);
+
+      priv->fragment_shader = shader;
+      break;
+    }
+
+  g_assert (shader != COGL_INVALID_HANDLE);
+
+  cogl_shader_compile (shader);
+  if (!cogl_shader_is_compiled (shader))
+    {
+      gchar *log_buf;
+
+      log_buf = cogl_shader_get_info_log (shader);
+
+      /* translators: the first %s is the type of the shader, either
+       * Vertex shader or Fragment shader; the second %s is the actual
+       * error as reported by COGL
+       */
+      g_set_error (error, CLUTTER_SHADER_ERROR,
+                   CLUTTER_SHADER_ERROR_COMPILE,
+                   _("%s compilation failed: %s"),
+                   shader_type == CLUTTER_VERTEX_SHADER ? _("Vertex shader")
+                                                        : _("Fragment shader"),
+                   log_buf);
+
+      g_free (log_buf);
+
+      return FALSE;
+    }
+
+  cogl_program_attach_shader (priv->program, shader);
+
+  return TRUE;
+}
+
+static gboolean
+bind_glsl_shader (ClutterShader  *self,
+                  GError        **error)
+{
+  ClutterShaderPrivate *priv = self->priv;
+  GError *bind_error = NULL;
+  gboolean res;
+
+  priv->program = cogl_create_program ();
+
+  if (priv->vertex_source != COGL_INVALID_HANDLE)
+    {
+      res = clutter_shader_glsl_bind (self,
+                                      CLUTTER_VERTEX_SHADER,
+                                      &bind_error);
+
+      if (!res)
+        {
+          g_propagate_error (error, bind_error);
+          return FALSE;
+        }
+    }
+
+  if (priv->fragment_source != COGL_INVALID_HANDLE)
+    {
+      res = clutter_shader_glsl_bind (self,
+                                      CLUTTER_FRAGMENT_SHADER,
+                                      &bind_error);
+
+      if (!res)
+        {
+          g_propagate_error (error, bind_error);
+          return FALSE;
+        }
+    }
+
+  cogl_program_link (priv->program);
+
+  return TRUE;
+}
+
+/**
+ * clutter_shader_compile:
+ * @shader: a #ClutterShader
+ * @error: return location for a #GError, or %NULL
+ *
+ * Compiles and links GLSL sources set for vertex and fragment shaders for
+ * a #ClutterShader. If the compilation fails and a #GError return location is
+ * provided the error will contain the errors from the compiler, if any.
+ *
+ * Return value: returns TRUE if the shader was succesfully compiled.
+ *
+ * Since: 0.8
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+gboolean
+clutter_shader_compile (ClutterShader  *shader,
+                        GError        **error)
+{
+  ClutterShaderPrivate *priv;
+
+  g_return_val_if_fail (CLUTTER_IS_SHADER (shader), FALSE);
+
+  priv = shader->priv;
+
+  if (priv->compiled)
+    return priv->compiled;
+
+  if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
+    {
+      g_set_error (error, CLUTTER_SHADER_ERROR,
+                   CLUTTER_SHADER_ERROR_NO_GLSL,
+                   "GLSL shaders not supported");
+      priv->compiled = FALSE;
+      return priv->compiled;
+    }
+
+  priv->compiled = bind_glsl_shader (shader, error);
+  g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_COMPILED]);
+
+  return priv->compiled;
+}
+
+/**
+ * clutter_shader_release:
+ * @shader: a #ClutterShader
+ *
+ * Frees up any GL context resources held by the shader.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+void
+clutter_shader_release (ClutterShader *shader)
+{
+  g_return_if_fail (CLUTTER_IS_SHADER (shader));
+
+  clutter_shader_release_internal (shader);
+
+  g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_COMPILED]);
+}
+
+/**
+ * clutter_shader_is_compiled:
+ * @shader: a #ClutterShader
+ *
+ * Checks whether @shader is is currently compiled, linked and bound
+ * to the GL context.
+ *
+ * Return value: %TRUE if the shader is compiled, linked and ready for use.
+ *
+ * Since: 0.8
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+gboolean
+clutter_shader_is_compiled (ClutterShader *shader)
+{
+  g_return_val_if_fail (CLUTTER_IS_SHADER (shader), FALSE);
+
+  return shader->priv->compiled;
+}
+
+/**
+ * clutter_shader_set_is_enabled:
+ * @shader: a #ClutterShader
+ * @enabled: The new state of the shader.
+ *
+ * Enables a shader. This function will attempt to compile and link
+ * the shader, if it isn't already.
+ *
+ * When @enabled is %FALSE the default state of the GL pipeline will be
+ * used instead.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+void
+clutter_shader_set_is_enabled (ClutterShader *shader,
+                               gboolean       enabled)
+{
+  ClutterShaderPrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_SHADER (shader));
+
+  priv = shader->priv;
+
+  if (priv->is_enabled != enabled)
+    {
+      GError *error = NULL;
+      gboolean res;
+
+      res = clutter_shader_compile (shader, &error);
+      if (!res)
+        {
+          g_warning ("Unable to bind the shader: %s",
+                     error ? error->message : "unknown error");
+          if (error)
+            g_error_free (error);
+
+          return;
+        }
+
+      priv->is_enabled = enabled;
+
+      if (priv->is_enabled)
+        cogl_program_use (priv->program);
+      else
+        cogl_program_use (COGL_INVALID_HANDLE);
+
+      g_object_notify_by_pspec (G_OBJECT (shader), obj_props[PROP_ENABLED]);
+    }
+}
+
+/**
+ * clutter_shader_get_is_enabled:
+ * @shader: a #ClutterShader
+ *
+ * Checks whether @shader is enabled.
+ *
+ * Return value: %TRUE if the shader is enabled.
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+gboolean
+clutter_shader_get_is_enabled (ClutterShader *shader)
+{
+  g_return_val_if_fail (CLUTTER_IS_SHADER (shader), FALSE);
+
+  return shader->priv->is_enabled;
+}
+
+/**
+ * clutter_shader_set_uniform:
+ * @shader: a #ClutterShader.
+ * @name: name of uniform in GLSL shader program to set.
+ * @value: a #ClutterShaderFloat, #ClutterShaderInt or #ClutterShaderMatrix
+ *         #GValue.
+ *
+ * Sets a user configurable variable in the GLSL shader programs attached to
+ * a #ClutterShader.
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+void
+clutter_shader_set_uniform (ClutterShader *shader,
+                            const gchar   *name,
+                            const GValue  *value)
+{
+  ClutterShaderPrivate *priv;
+  int                   location = 0;
+  gsize                 size;
+
+  g_return_if_fail (CLUTTER_IS_SHADER (shader));
+  g_return_if_fail (name != NULL);
+  g_return_if_fail (value != NULL);
+  g_return_if_fail (CLUTTER_VALUE_HOLDS_SHADER_FLOAT (value) ||
+                    CLUTTER_VALUE_HOLDS_SHADER_INT (value) ||
+                    CLUTTER_VALUE_HOLDS_SHADER_MATRIX (value) ||
+                    G_VALUE_HOLDS_FLOAT (value) ||
+                    G_VALUE_HOLDS_INT (value));
+
+  priv = shader->priv;
+  g_return_if_fail (priv->program != COGL_INVALID_HANDLE);
+
+  location = cogl_program_get_uniform_location (priv->program, name);
+
+  if (CLUTTER_VALUE_HOLDS_SHADER_FLOAT (value))
+    {
+      const float *floats;
+
+      floats = clutter_value_get_shader_float (value, &size);
+      cogl_program_set_uniform_float (priv->program,
+                                      location, size, 1, floats);
+    }
+  else if (CLUTTER_VALUE_HOLDS_SHADER_INT (value))
+    {
+      const int *ints;
+
+      ints = clutter_value_get_shader_int (value, &size);
+      cogl_program_set_uniform_int (priv->program,
+                                    location, size, 1, ints);
+    }
+  else if (CLUTTER_VALUE_HOLDS_SHADER_MATRIX (value))
+    {
+      const float *matrix;
+
+      matrix = clutter_value_get_shader_matrix (value, &size);
+      cogl_program_set_uniform_matrix (priv->program,
+                                       location, size, 1, FALSE, matrix);
+    }
+  else if (G_VALUE_HOLDS_FLOAT (value))
+    {
+      float float_val = g_value_get_float (value);
+
+      cogl_program_set_uniform_float (priv->program,
+                                      location, 1, 1, &float_val);
+    }
+  else if (G_VALUE_HOLDS_INT (value))
+    {
+      int int_val = g_value_get_int (value);
+
+      cogl_program_set_uniform_int (priv->program,
+                                    location, 1, 1, &int_val);
+    }
+  else
+    g_assert_not_reached ();
+}
+
+/**
+ * clutter_shader_get_fragment_source:
+ * @shader: a #ClutterShader
+ *
+ * Query the current GLSL fragment source set on @shader.
+ *
+ * Return value: the source of the fragment shader for this
+ * ClutterShader object or %NULL. The returned string is owned by the
+ * shader object and should never be modified or freed
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+const gchar *
+clutter_shader_get_fragment_source (ClutterShader *shader)
+{
+  g_return_val_if_fail (CLUTTER_IS_SHADER (shader), NULL);
+
+  return clutter_shader_get_source (shader, CLUTTER_FRAGMENT_SHADER);
+}
+
+/**
+ * clutter_shader_get_vertex_source:
+ * @shader: a #ClutterShader
+ *
+ * Query the current GLSL vertex source set on @shader.
+ *
+ * Return value: the source of the vertex shader for this
+ * ClutterShader object or %NULL. The returned string is owned by the
+ * shader object and should never be modified or freed
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+const gchar *
+clutter_shader_get_vertex_source (ClutterShader *shader)
+{
+  g_return_val_if_fail (CLUTTER_IS_SHADER (shader), NULL);
+
+  return clutter_shader_get_source (shader, CLUTTER_VERTEX_SHADER);
+}
+
+/**
+ * clutter_shader_get_cogl_program:
+ * @shader: a #ClutterShader
+ *
+ * Retrieves the underlying #CoglHandle for the shader program.
+ *
+ * Return value: (transfer none): A #CoglHandle for the shader program,
+ *   or %NULL. The handle is owned by the #ClutterShader and it should
+ *   not be unreferenced
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+CoglHandle
+clutter_shader_get_cogl_program (ClutterShader *shader)
+{
+  g_return_val_if_fail (CLUTTER_IS_SHADER (shader), NULL);
+
+  return shader->priv->program;
+}
+
+/**
+ * clutter_shader_get_cogl_fragment_shader:
+ * @shader: a #ClutterShader
+ *
+ * Retrieves the underlying #CoglHandle for the fragment shader.
+ *
+ * Return value: (transfer none): A #CoglHandle for the fragment
+ *   shader, or %NULL. The handle is owned by the #ClutterShader
+ *   and it should not be unreferenced
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+CoglHandle
+clutter_shader_get_cogl_fragment_shader (ClutterShader *shader)
+{
+  g_return_val_if_fail (CLUTTER_IS_SHADER (shader), NULL);
+
+  return clutter_shader_get_cogl_shader (shader, CLUTTER_FRAGMENT_SHADER);
+}
+
+/**
+ * clutter_shader_get_cogl_vertex_shader:
+ * @shader: a #ClutterShader
+ *
+ * Retrieves the underlying #CoglHandle for the vertex shader.
+ *
+ * Return value: (transfer none): A #CoglHandle for the vertex
+ *   shader, or %NULL. The handle is owned by the #ClutterShader
+ *   and it should not be unreferenced
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead.
+ */
+CoglHandle
+clutter_shader_get_cogl_vertex_shader (ClutterShader *shader)
+{
+  g_return_val_if_fail (CLUTTER_IS_SHADER (shader), NULL);
+
+  return clutter_shader_get_cogl_shader (shader, CLUTTER_VERTEX_SHADER);
+}
+
+GQuark
+clutter_shader_error_quark (void)
+{
+  return g_quark_from_static_string ("clutter-shader-error");
+}
--- a/clutter/clutter/deprecated/clutter-shader.h
+++ b/clutter/clutter/deprecated/clutter-shader.h
@@ -0,0 +1,158 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum  <mallum@openedhand.com>
+ *             Øyvind Kolås   <pippin@o-hand.com>
+ *
+ * Copyright (C) 2007 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_SHADER_H__
+#define __CLUTTER_SHADER_H__
+
+#include <clutter/clutter-types.h>
+#include <clutter/clutter-shader-types.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_TYPE_SHADER         (clutter_shader_get_type ())
+#define CLUTTER_SHADER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CLUTTER_TYPE_SHADER, ClutterShader))
+#define CLUTTER_SHADER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), CLUTTER_TYPE_SHADER, ClutterShaderClass))
+#define CLUTTER_IS_SHADER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CLUTTER_TYPE_SHADER))
+#define CLUTTER_IS_SHADER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CLUTTER_TYPE_SHADER))
+#define CLUTTER_SHADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CLUTTER_TYPE_SHADER, ClutterShaderClass))
+
+/**
+ * CLUTTER_SHADER_ERROR:
+ *
+ * Error domain for #ClutterShader errors
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8
+ */
+#define CLUTTER_SHADER_ERROR        (clutter_shader_error_quark ())
+
+/**
+ * ClutterShaderError:
+ * @CLUTTER_SHADER_ERROR_NO_ASM: No ASM shaders support
+ * @CLUTTER_SHADER_ERROR_NO_GLSL: No GLSL shaders support
+ * @CLUTTER_SHADER_ERROR_COMPILE: Compilation error
+ *
+ * #ClutterShader error enumeration
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8
+ */
+typedef enum {
+  CLUTTER_SHADER_ERROR_NO_ASM,
+  CLUTTER_SHADER_ERROR_NO_GLSL,
+  CLUTTER_SHADER_ERROR_COMPILE
+} ClutterShaderError;
+
+typedef struct _ClutterShaderPrivate ClutterShaderPrivate;
+typedef struct _ClutterShaderClass   ClutterShaderClass;
+
+/**
+ * ClutterShader:
+ *
+ * The #ClutterShader structure contains only private data
+ * and should be accessed using the provided API
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffect instead
+ */
+struct _ClutterShader
+{
+  /*< private >*/
+  GObject               parent;
+  ClutterShaderPrivate *priv;
+};
+
+/**
+ * ClutterShaderClass:
+ *
+ * The #ClutterShaderClass structure contains only private data
+ *
+ * Since: 0.6
+ *
+ * Deprecated: 1.8: Use #ClutterShaderEffectClass instead
+ */
+struct _ClutterShaderClass
+{
+  /*< private >*/
+  GObjectClass parent_class;
+};
+
+CLUTTER_DEPRECATED
+GQuark clutter_shader_error_quark (void);
+
+CLUTTER_DEPRECATED
+GType clutter_shader_get_type (void) G_GNUC_CONST;
+
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+ClutterShader *       clutter_shader_new                      (void);
+
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+void                  clutter_shader_set_is_enabled           (ClutterShader      *shader,
+                                                               gboolean            enabled);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+gboolean              clutter_shader_get_is_enabled           (ClutterShader      *shader);
+
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+gboolean              clutter_shader_compile                  (ClutterShader      *shader,
+                                                               GError            **error);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+void                  clutter_shader_release                  (ClutterShader      *shader);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+gboolean              clutter_shader_is_compiled              (ClutterShader      *shader);
+
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+void                  clutter_shader_set_vertex_source        (ClutterShader      *shader,
+                                                               const gchar        *data,
+                                                               gssize              length);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+void                  clutter_shader_set_fragment_source      (ClutterShader      *shader,
+                                                               const gchar        *data,
+                                                               gssize              length);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+const gchar *         clutter_shader_get_vertex_source        (ClutterShader      *shader);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+const gchar *         clutter_shader_get_fragment_source      (ClutterShader      *shader);
+
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+void                  clutter_shader_set_uniform              (ClutterShader      *shader,
+                                                               const gchar        *name,
+                                                               const GValue       *value);
+
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CoglHandle            clutter_shader_get_cogl_program         (ClutterShader      *shader);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CoglHandle            clutter_shader_get_cogl_fragment_shader (ClutterShader      *shader);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CoglHandle            clutter_shader_get_cogl_vertex_shader   (ClutterShader      *shader);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_SHADER_H__ */
--- a/clutter/clutter/deprecated/clutter-texture.c
+++ b/clutter/clutter/deprecated/clutter-texture.c
@@ -64,6 +64,7 @@
 #include "clutter-stage-private.h"
 #include "clutter-backend.h"

+#include "deprecated/clutter-shader.h"
 #include "deprecated/clutter-texture.h"

 typedef struct _ClutterTextureAsyncData ClutterTextureAsyncData;
@@ -1277,7 +1278,9 @@ clutter_texture_init (ClutterTexture *self)

      texture_template_pipeline = cogl_pipeline_new (ctx);
      pipeline = COGL_PIPELINE (texture_template_pipeline);
-      cogl_pipeline_set_layer_null_texture (pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (pipeline,
+                                            0, /* layer_index */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  g_assert (texture_template_pipeline != NULL);
--- a/clutter/clutter/deprecated/clutter-timeout-interval.c
+++ b/clutter/clutter/deprecated/clutter-timeout-interval.c
@@ -0,0 +1,140 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Neil Roberts  <neil@linux.intel.com>
+ *
+ * Copyright (C) 2009  Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "clutter-build-config.h"
+
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
+/* This file contains the common code to check whether an interval has
+   expired used in clutter-frame-source and clutter-timeout-pool. */
+
+#include "clutter-timeout-interval.h"
+
+void
+_clutter_timeout_interval_init (ClutterTimeoutInterval *interval,
+                                guint                   fps)
+{
+#if GLIB_CHECK_VERSION (2, 27, 3)
+  interval->start_time = g_get_monotonic_time () / 1000;
+#else
+  {
+    GTimeVal start_time;
+    g_get_current_time (&start_time);
+    interval->start_time = start_time.tv_sec * 1000
+                         + start_time.tv_usec / 1000;
+  }
+#endif
+
+  interval->fps = fps;
+  interval->frame_count = 0;
+}
+
+static gint64
+_clutter_timeout_interval_get_ticks (gint64                  current_time,
+                                     ClutterTimeoutInterval *interval)
+{
+  return MAX (current_time - interval->start_time, 0);
+}
+
+gboolean
+_clutter_timeout_interval_prepare (gint64                  current_time,
+                                   ClutterTimeoutInterval *interval,
+                                   gint                   *delay)
+{
+  gint elapsed_time, new_frame_num;
+
+  elapsed_time = _clutter_timeout_interval_get_ticks (current_time, interval);
+  new_frame_num = elapsed_time * interval->fps / 1000;
+
+  /* If time has gone backwards or the time since the last frame is
+     greater than the two frames worth then reset the time and do a
+     frame now */
+  if (new_frame_num < interval->frame_count ||
+      new_frame_num - interval->frame_count > 2)
+    {
+      /* Get the frame time rounded up to the nearest ms */
+      guint frame_time = (1000 + interval->fps - 1) / interval->fps;
+
+      /* Reset the start time */
+      interval->start_time = current_time;
+
+      /* Move the start time as if one whole frame has elapsed */
+      interval->start_time -= frame_time;
+
+      interval->frame_count = 0;
+
+      if (delay)
+	*delay = 0;
+
+      return TRUE;
+    }
+  else if (new_frame_num > interval->frame_count)
+    {
+      if (delay)
+	*delay = 0;
+
+      return TRUE;
+    }
+  else
+    {
+      if (delay)
+	*delay = ((interval->frame_count + 1) * 1000 / interval->fps
+               - elapsed_time);
+
+      return FALSE;
+    }
+}
+
+gboolean
+_clutter_timeout_interval_dispatch (ClutterTimeoutInterval *interval,
+                                    GSourceFunc             callback,
+                                    gpointer                user_data)
+{
+  if ((* callback) (user_data))
+    {
+      interval->frame_count++;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gint
+_clutter_timeout_interval_compare_expiration (const ClutterTimeoutInterval *a,
+                                              const ClutterTimeoutInterval *b)
+{
+  guint a_delay = 1000 / a->fps;
+  guint b_delay = 1000 / b->fps;
+  gint64 b_difference;
+  gint comparison;
+
+  b_difference = a->start_time - b->start_time;
+
+  comparison = ((gint) ((a->frame_count + 1) * a_delay)
+             - (gint) ((b->frame_count + 1) * b_delay + b_difference));
+
+  return (comparison < 0 ? -1
+                         : comparison > 0 ? 1
+                                          : 0);
+}
--- a/clutter/clutter/deprecated/clutter-timeout-interval.h
+++ b/clutter/clutter/deprecated/clutter-timeout-interval.h
@@ -0,0 +1,58 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Neil Roberts  <neil@linux.intel.com>
+ *
+ * Copyright (C) 2009  Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CLUTTER_TIMEOUT_INTERVAL_H__
+#define __CLUTTER_TIMEOUT_INTERVAL_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef struct _ClutterTimeoutInterval ClutterTimeoutInterval;
+
+struct _ClutterTimeoutInterval
+{
+  /* milliseconds */
+  gint64 start_time;
+
+  guint frame_count;
+  guint fps;
+};
+
+void     _clutter_timeout_interval_init               (ClutterTimeoutInterval       *interval,
+                                                       guint                         fps);
+
+gboolean _clutter_timeout_interval_prepare            (gint64 current_time,
+                                                       ClutterTimeoutInterval       *interval,
+                                                       gint                         *delay);
+
+gboolean _clutter_timeout_interval_dispatch           (ClutterTimeoutInterval       *interval,
+                                                       GSourceFunc                   callback,
+                                                       gpointer                      user_data);
+
+gint     _clutter_timeout_interval_compare_expiration (const ClutterTimeoutInterval *a,
+                                                       const ClutterTimeoutInterval *b);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_TIMEOUT_INTERVAL_H__ */
--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
@@ -46,8 +46,7 @@ G_DEFINE_TYPE (ClutterInputDeviceEvdev,
               clutter_input_device_evdev,
               CLUTTER_TYPE_INPUT_DEVICE)

-enum
-{
+enum {
  PROP_0,
  PROP_DEVICE_MATRIX,
  PROP_OUTPUT_ASPECT_RATIO,
@@ -676,7 +675,7 @@ stop_toggle_slowkeys (ClutterInputDeviceEvdev *device)
 }

 static void
-handle_enablekeys_press (ClutterEvent            *event,
+handle_togglekeys_press (ClutterEvent            *event,
                         ClutterInputDeviceEvdev *device)
 {
  if (event->key.keyval == XKB_KEY_Shift_L || event->key.keyval == XKB_KEY_Shift_R)
@@ -698,7 +697,7 @@ handle_enablekeys_press (ClutterEvent            *event,
 }

 static void
-handle_enablekeys_release (ClutterEvent            *event,
+handle_togglekeys_release (ClutterEvent            *event,
                           ClutterInputDeviceEvdev *device)
 {
  if (event->key.keyval == XKB_KEY_Shift_L || event->key.keyval == XKB_KEY_Shift_R)
@@ -724,11 +723,11 @@ get_button_index (gint button)
 {
  switch (button)
    {
-    case CLUTTER_BUTTON_PRIMARY:
+    case BTN_LEFT:
      return 0;
-    case CLUTTER_BUTTON_MIDDLE:
+    case BTN_MIDDLE:
      return 1;
-    case CLUTTER_BUTTON_SECONDARY:
+    case BTN_RIGHT:
      return 2;
    default:
      break;
@@ -855,21 +854,13 @@ emulate_pointer_motion (ClutterInputDeviceEvdev *device,
  clutter_virtual_input_device_notify_relative_motion (device->mousekeys_virtual_device,
                                                       time_us, dx_motion, dy_motion);
 }
-static gboolean
-is_numlock_active (ClutterInputDeviceEvdev *device)
-{
-  ClutterSeatEvdev *seat = device->seat;
-  return xkb_state_mod_name_is_active (seat->xkb,
-                                       "Mod2",
-                                       XKB_STATE_MODS_LOCKED);
-}

 static void
 enable_mousekeys (ClutterInputDeviceEvdev *device)
 {
  ClutterDeviceManager *manager;

-  device->mousekeys_btn = CLUTTER_BUTTON_PRIMARY;
+  device->mousekeys_btn = BTN_LEFT;
  device->move_mousekeys_timer = 0;
  device->mousekeys_first_motion_time = 0;
  device->mousekeys_last_motion_time = 0;
@@ -890,21 +881,21 @@ disable_mousekeys (ClutterInputDeviceEvdev *device)
  stop_mousekeys_move (device);

  /* Make sure we don't leave button pressed behind... */
-  if (device->mousekeys_btn_states[get_button_index (CLUTTER_BUTTON_PRIMARY)])
+  if (device->mousekeys_btn_states[get_button_index (BTN_LEFT)])
    {
-      device->mousekeys_btn = CLUTTER_BUTTON_PRIMARY;
+      device->mousekeys_btn = BTN_LEFT;
      emulate_button_release (device);
    }

-  if (device->mousekeys_btn_states[get_button_index (CLUTTER_BUTTON_MIDDLE)])
+  if (device->mousekeys_btn_states[get_button_index (BTN_MIDDLE)])
    {
-      device->mousekeys_btn = CLUTTER_BUTTON_MIDDLE;
+      device->mousekeys_btn = BTN_MIDDLE;
      emulate_button_release (device);
    }

-  if (device->mousekeys_btn_states[get_button_index (CLUTTER_BUTTON_SECONDARY)])
+  if (device->mousekeys_btn_states[get_button_index (BTN_RIGHT)])
    {
-      device->mousekeys_btn = CLUTTER_BUTTON_SECONDARY;
+      device->mousekeys_btn = BTN_RIGHT;
      emulate_button_release (device);
    }

@@ -1021,21 +1012,17 @@ handle_mousekeys_press (ClutterEvent            *event,
  if (!(event->key.flags & CLUTTER_EVENT_FLAG_SYNTHETIC))
    stop_mousekeys_move (device);

-  /* Do not handle mousekeys if NumLock is ON */
-  if (is_numlock_active (device))
-    return FALSE;
-
  /* Button selection */
  switch (event->key.keyval)
    {
    case XKB_KEY_KP_Divide:
-      device->mousekeys_btn = CLUTTER_BUTTON_PRIMARY;
+      device->mousekeys_btn = BTN_LEFT;
      return TRUE;
    case XKB_KEY_KP_Multiply:
-      device->mousekeys_btn = CLUTTER_BUTTON_MIDDLE;
+      device->mousekeys_btn = BTN_MIDDLE;
      return TRUE;
    case XKB_KEY_KP_Subtract:
-      device->mousekeys_btn = CLUTTER_BUTTON_SECONDARY;
+      device->mousekeys_btn = BTN_RIGHT;
      return TRUE;
    default:
      break;
@@ -1096,10 +1083,6 @@ static gboolean
 handle_mousekeys_release (ClutterEvent            *event,
                          ClutterInputDeviceEvdev *device)
 {
-  /* Do not handle mousekeys if NumLock is ON */
-  if (is_numlock_active (device))
-    return FALSE;
-
  switch (event->key.keyval)
    {
    case XKB_KEY_KP_0:
@@ -1148,13 +1131,8 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent               *e
  if (event->key.flags & CLUTTER_EVENT_FLAG_INPUT_METHOD)
    goto emit_event;

-  if (device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED)
-    {
-      if (event->type == CLUTTER_KEY_PRESS)
-        handle_enablekeys_press (event, device_evdev);
-      else
-        handle_enablekeys_release (event, device_evdev);
-    }
+  if (!device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED)
+    goto emit_event;

  if (device_evdev->a11y_flags & CLUTTER_A11Y_MOUSE_KEYS_ENABLED)
    {
@@ -1166,6 +1144,14 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent               *e
        return; /* swallow event */
    }

+  if (device_evdev->a11y_flags & CLUTTER_A11Y_TOGGLE_KEYS_ENABLED)
+    {
+      if (event->type == CLUTTER_KEY_PRESS)
+        handle_togglekeys_press (event, device_evdev);
+      else
+        handle_togglekeys_release (event, device_evdev);
+    }
+
  if ((device_evdev->a11y_flags & CLUTTER_A11Y_BOUNCE_KEYS_ENABLED) &&
      (get_debounce_delay (device) != 0))
    {
@@ -1279,6 +1265,18 @@ clutter_input_device_evdev_release_touch_state (ClutterInputDeviceEvdev *device,
                       GINT_TO_POINTER (touch_state->device_slot));
 }

+static gboolean
+clutter_input_device_evdev_get_physical_size (ClutterInputDevice *device,
+                                              gdouble            *width,
+                                              gdouble            *height)
+{
+  struct libinput_device *libinput_device;
+
+  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
+
+  return libinput_device_get_size (libinput_device, width, height) == 0;
+}
+
 static void
 clutter_input_device_evdev_class_init (ClutterInputDeviceEvdevClass *klass)
 {
@@ -1294,6 +1292,7 @@ clutter_input_device_evdev_class_init (ClutterInputDeviceEvdevClass *klass)
  klass->get_group_n_modes = clutter_input_device_evdev_get_group_n_modes;
  klass->is_grouped = clutter_input_device_evdev_is_grouped;
  klass->process_kbd_a11y_event = clutter_input_device_evdev_process_kbd_a11y_event;
+  klass->get_physical_size = clutter_input_device_evdev_get_physical_size;

  obj_props[PROP_DEVICE_MATRIX] =
    g_param_spec_boxed ("device-matrix",
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -1,4 +1,3 @@
-clutter_clutter_includesubdir = join_paths(clutter_includesubdir, 'clutter')
 clutter_clutter_includedir = join_paths(clutter_includedir, 'clutter')

 clutter_headers = [
@@ -223,16 +222,23 @@ clutter_deprecated_headers = [
  'deprecated/clutter-animation.h',
  'deprecated/clutter-behaviour.h',
  'deprecated/clutter-behaviour-depth.h',
+  'deprecated/clutter-behaviour-ellipse.h',
  'deprecated/clutter-behaviour-opacity.h',
+  'deprecated/clutter-behaviour-path.h',
+  'deprecated/clutter-behaviour-rotate.h',
  'deprecated/clutter-behaviour-scale.h',
  'deprecated/clutter-bin-layout.h',
  'deprecated/clutter-box.h',
  'deprecated/clutter-cairo-texture.h',
  'deprecated/clutter-container.h',
  'deprecated/clutter-group.h',
+  'deprecated/clutter-input-device.h',
  'deprecated/clutter-keysyms.h',
+  'deprecated/clutter-list-model.h',
  'deprecated/clutter-main.h',
+  'deprecated/clutter-model.h',
  'deprecated/clutter-rectangle.h',
+  'deprecated/clutter-shader.h',
  'deprecated/clutter-stage-manager.h',
  'deprecated/clutter-stage.h',
  'deprecated/clutter-state.h',
@@ -247,18 +253,34 @@ clutter_deprecated_sources = [
  'deprecated/clutter-animation.c',
  'deprecated/clutter-behaviour.c',
  'deprecated/clutter-behaviour-depth.c',
+  'deprecated/clutter-behaviour-ellipse.c',
  'deprecated/clutter-behaviour-opacity.c',
+  'deprecated/clutter-behaviour-path.c',
+  'deprecated/clutter-behaviour-rotate.c',
  'deprecated/clutter-behaviour-scale.c',
  'deprecated/clutter-box.c',
  'deprecated/clutter-cairo-texture.c',
  'deprecated/clutter-group.c',
+  'deprecated/clutter-input-device-deprecated.c',
  'deprecated/clutter-layout-manager-deprecated.c',
+  'deprecated/clutter-list-model.c',
+  'deprecated/clutter-model.c',
  'deprecated/clutter-rectangle.c',
+  'deprecated/clutter-shader.c',
  'deprecated/clutter-state.c',
  'deprecated/clutter-table-layout.c',
  'deprecated/clutter-texture.c',
 ]

+clutter_deprecated_private_headers = [
+  'deprecated/clutter-model-private.h',
+  'deprecated/clutter-timeout-interval.h',
+]
+
+clutter_deprecated_nonintrospected_sources = [
+  'deprecated/clutter-timeout-interval.c',
+]
+
 clutter_backend_sources = []
 clutter_backend_nonintrospected_sources = [
  'cogl/clutter-stage-cogl.c',
@@ -278,6 +300,7 @@ if have_x11
    'x11/clutter-keymap-x11.c',
    'x11/clutter-stage-x11.c',
    'x11/clutter-virtual-input-device-x11.c',
+    'x11/clutter-x11-texture-pixmap.c',
  ]
  clutter_backend_sources += clutter_x11_sources

@@ -288,6 +311,7 @@ if have_x11

  clutter_x11_headers = [
    'x11/clutter-x11.h',
+    'x11/clutter-x11-texture-pixmap.h',
  ]
  clutter_backend_headers += clutter_x11_headers

@@ -472,7 +496,9 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
    clutter_private_headers,
    clutter_nonintrospected_sources,
    clutter_deprecated_sources,
+    clutter_deprecated_nonintrospected_sources,
    clutter_deprecated_headers,
+    clutter_deprecated_private_headers,
    clutter_backend_sources,
    clutter_backend_nonintrospected_sources,
    clutter_backend_headers,
@@ -578,16 +604,16 @@ if have_introspection
 endif

 install_headers(clutter_headers,
-  subdir: clutter_clutter_includesubdir)
+  subdir: clutter_clutter_includedir)

 install_headers(cally_headers,
-  subdir: join_paths(clutter_includesubdir, 'cally'))
+  subdir: join_paths(clutter_includedir, 'cally'))

 install_headers(clutter_deprecated_headers,
-  subdir: join_paths(clutter_clutter_includesubdir, 'deprecated'))
+  subdir: join_paths(clutter_clutter_includedir, 'deprecated'))

 install_headers(clutter_x11_headers,
-  subdir: join_paths(clutter_clutter_includesubdir, 'x11'))
+  subdir: join_paths(clutter_clutter_includedir, 'x11'))

 pkg.generate(libmutter_clutter,
  name: 'Mutters Clutter',
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@@ -54,7 +54,6 @@
 #include "clutter-main.h"
 #include "clutter-private.h"
 #include "clutter-settings-private.h"
-#include "clutter-xkb-a11y-x11.h"

 G_DEFINE_TYPE (ClutterBackendX11, clutter_backend_x11, CLUTTER_TYPE_BACKEND)

@@ -277,20 +276,6 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
  _clutter_backend_add_event_translator (backend, translator);
 }

-static void
-on_keymap_state_change (ClutterKeymapX11 *keymap_x11,
-                        gpointer          data)
-{
-  ClutterDeviceManager *device_manager = CLUTTER_DEVICE_MANAGER (data);
-  ClutterKbdA11ySettings kbd_a11y_settings;
-
-  /* On keymaps state change, just reapply the current settings, it'll
-   * take care of enabling/disabling mousekeys based on NumLock state.
-   */
-  clutter_device_manager_get_kbd_a11y_settings (device_manager, &kbd_a11y_settings);
-  clutter_device_manager_x11_apply_kbd_a11y_settings (device_manager, &kbd_a11y_settings);
-}
-
 static void
 clutter_backend_x11_create_keymap (ClutterBackendX11 *backend_x11)
 {
@@ -307,11 +292,6 @@ clutter_backend_x11_create_keymap (ClutterBackendX11 *backend_x11)
      backend = CLUTTER_BACKEND (backend_x11);
      translator = CLUTTER_EVENT_TRANSLATOR (backend_x11->keymap);
      _clutter_backend_add_event_translator (backend, translator);
-
-      g_signal_connect (backend_x11->keymap,
-                        "state-changed",
-                        G_CALLBACK (on_keymap_state_change),
-                        backend->device_manager);
    }
 }

--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
@@ -76,8 +76,7 @@ static const char *wacom_type_atoms[] = {
 };
 #define N_WACOM_TYPE_ATOMS G_N_ELEMENTS (wacom_type_atoms)

-enum
-{
+enum {
    WACOM_TYPE_STYLUS,
    WACOM_TYPE_CURSOR,
    WACOM_TYPE_ERASER,
@@ -85,8 +84,7 @@ enum
    WACOM_TYPE_TOUCH,
 };

-enum
-{
+enum {
  PAD_AXIS_FIRST  = 3, /* First axes are always x/y/pressure, ignored in pads */
  PAD_AXIS_STRIP1 = PAD_AXIS_FIRST,
  PAD_AXIS_STRIP2,
--- a/clutter/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/clutter/x11/clutter-input-device-xi2.c
@@ -180,6 +180,56 @@ clutter_input_device_xi2_is_mode_switch_button (ClutterInputDevice *device,
  return button_group == (int) group;
 }

+static gboolean
+clutter_input_device_xi2_get_physical_size (ClutterInputDevice *device,
+                                            gdouble            *width,
+                                            gdouble            *height)
+{
+  Display *xdisplay;
+  XIDeviceInfo *dev_info;
+  gdouble w = 0, h = 0;
+  int i, n_info, device_id;
+
+  xdisplay = clutter_x11_get_default_display ();
+  device_id = clutter_input_device_get_device_id (device);
+
+  clutter_x11_trap_x_errors ();
+  dev_info = XIQueryDevice (xdisplay, device_id, &n_info);
+  if (clutter_x11_untrap_x_errors ())
+    return FALSE;
+
+  if (!dev_info)
+    return FALSE;
+
+  for (i = 0; i < dev_info->num_classes; i++)
+    {
+      XIValuatorClassInfo *valuator;
+      gdouble *value;
+
+      if (dev_info->classes[i]->type != XIValuatorClass)
+        continue;
+
+      valuator = (XIValuatorClassInfo *) dev_info->classes[i];
+
+      if (valuator->label == XInternAtom (xdisplay, "Abs X", True) ||
+          valuator->label == XInternAtom (xdisplay, "Abs MT Position X", True))
+        value = &w;
+      else if (valuator->label == XInternAtom (xdisplay, "Abs Y", True) ||
+               valuator->label == XInternAtom (xdisplay, "Abs MT Position Y", True))
+        value = &h;
+      else
+        continue;
+
+      *value = (valuator->max -  valuator->min) * 1000 / valuator->resolution;
+    }
+
+  XIFreeDeviceInfo (dev_info);
+  *width = w;
+  *height = h;
+
+  return (w > 0 && h > 0);
+}
+
 static void
 clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
 {
@@ -193,6 +243,7 @@ clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
  device_class->is_grouped = clutter_input_device_xi2_is_grouped;
  device_class->get_group_n_modes = clutter_input_device_xi2_get_group_n_modes;
  device_class->is_mode_switch_button = clutter_input_device_xi2_is_mode_switch_button;
+  device_class->get_physical_size = clutter_input_device_xi2_get_physical_size;
 }

 static void
--- a/clutter/clutter/x11/clutter-keymap-x11.c
+++ b/clutter/clutter/x11/clutter-keymap-x11.c
@@ -250,8 +250,7 @@ get_direction (XkbDescPtr xkb,
    {
      int level = 0;
      KeySym sym = XkbKeySymEntry (xkb, code, level, group);
-      PangoDirection dir =
-        _clutter_pango_unichar_direction (clutter_keysym_to_unicode (sym));
+      PangoDirection dir = pango_unichar_direction (clutter_keysym_to_unicode (sym));

      switch (dir)
        {
@@ -956,26 +955,6 @@ clutter_keymap_x11_keycode_for_keyval (ClutterKeymapX11 *keymap_x11,
        }
    }

-  if (!found)
-    {
-      GHashTableIter iter;
-      gpointer key, value;
-
-      g_hash_table_iter_init (&iter, keymap_x11->reserved_keycodes);
-      while (!found && g_hash_table_iter_next (&iter, &key, &value))
-        {
-          guint reserved_keycode = GPOINTER_TO_UINT (key);
-          guint reserved_keysym = GPOINTER_TO_UINT (value);
-
-          if (keyval == reserved_keysym)
-            {
-              *keycode_out = reserved_keycode;
-              *level_out = 0;
-              found = TRUE;
-            }
-        }
-    }
-
  g_free (keys);
  return found;
 }
--- a/clutter/clutter/x11/clutter-x11-texture-pixmap.c
+++ b/clutter/clutter/x11/clutter-x11-texture-pixmap.c
--- a/clutter/clutter/x11/clutter-x11-texture-pixmap.h
+++ b/clutter/clutter/x11/clutter-x11-texture-pixmap.h
@@ -0,0 +1,116 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Johan Bilien  <johan.bilien@nokia.com>
+ *
+ * Copyright (C) 2007 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
+#ifndef __CLUTTER_X11_TEXTURE_PIXMAP_H__
+#define __CLUTTER_X11_TEXTURE_PIXMAP_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <clutter/clutter.h>
+
+#include <X11/Xlib.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_X11_TYPE_TEXTURE_PIXMAP                 (clutter_x11_texture_pixmap_get_type ())
+#define CLUTTER_X11_TEXTURE_PIXMAP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_X11_TYPE_TEXTURE_PIXMAP, ClutterX11TexturePixmap))
+#define CLUTTER_X11_TEXTURE_PIXMAP_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_X11_TYPE_TEXTURE_PIXMAP, ClutterX11TexturePixmapClass))
+#define CLUTTER_X11_IS_TEXTURE_PIXMAP(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_X11_TYPE_TEXTURE_PIXMAP))
+#define CLUTTER_X11_IS_TEXTURE_PIXMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_X11_TYPE_TEXTURE_PIXMAP))
+#define CLUTTER_X11_TEXTURE_PIXMAP_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_X11_TYPE_TEXTURE_PIXMAP, ClutterX11TexturePixmapClass))
+
+typedef struct _ClutterX11TexturePixmap        ClutterX11TexturePixmap;
+typedef struct _ClutterX11TexturePixmapClass   ClutterX11TexturePixmapClass;
+typedef struct _ClutterX11TexturePixmapPrivate ClutterX11TexturePixmapPrivate;
+
+/**
+ * ClutterX11TexturePixmap:
+ *
+ * The #ClutterX11TexturePixmap structure contains only private data
+ *
+ * Since: 0.8
+ */
+struct _ClutterX11TexturePixmap
+{
+  /*< private >*/
+  ClutterTexture parent;
+
+  ClutterX11TexturePixmapPrivate *priv;
+};
+
+/**
+ * ClutterX11TexturePixmapClass:
+ * @update_area: virtual function for updating the area of the texture
+ *
+ * The #ClutterX11TexturePixmapClass structure contains only private data
+ *
+ * Since: 0.8
+ */
+struct _ClutterX11TexturePixmapClass
+{
+  /*< private >*/
+  ClutterTextureClass parent_class;
+
+  /*< public >*/
+  void (* update_area) (ClutterX11TexturePixmap *texture,
+                        gint                     x,
+                        gint                     y,
+                        gint                     width,
+                        gint                     height);
+};
+
+CLUTTER_EXPORT
+GType clutter_x11_texture_pixmap_get_type (void) G_GNUC_CONST;
+
+CLUTTER_EXPORT
+ClutterActor *clutter_x11_texture_pixmap_new             (void);
+CLUTTER_EXPORT
+ClutterActor *clutter_x11_texture_pixmap_new_with_pixmap (Pixmap      pixmap);
+CLUTTER_EXPORT
+ClutterActor *clutter_x11_texture_pixmap_new_with_window (Window      window);
+
+CLUTTER_EXPORT
+void          clutter_x11_texture_pixmap_set_automatic   (ClutterX11TexturePixmap *texture,
+                                                          gboolean                 setting);
+CLUTTER_EXPORT
+void          clutter_x11_texture_pixmap_set_pixmap      (ClutterX11TexturePixmap *texture,
+                                                          Pixmap                   pixmap);
+CLUTTER_EXPORT
+void          clutter_x11_texture_pixmap_set_window      (ClutterX11TexturePixmap *texture,
+                                                          Window                   window,
+                                                          gboolean                 automatic);
+
+CLUTTER_EXPORT
+void          clutter_x11_texture_pixmap_sync_window     (ClutterX11TexturePixmap *texture);
+CLUTTER_EXPORT
+void          clutter_x11_texture_pixmap_update_area     (ClutterX11TexturePixmap *texture,
+                                                          gint                     x,
+                                                          gint                     y,
+                                                          gint                     width,
+                                                          gint                     height);
+
+G_END_DECLS
+
+#endif
--- a/clutter/clutter/x11/clutter-x11.h
+++ b/clutter/clutter/x11/clutter-x11.h
@@ -42,6 +42,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <clutter/clutter.h>
+#include <clutter/x11/clutter-x11-texture-pixmap.h>

 G_BEGIN_DECLS

@@ -57,8 +58,7 @@ G_BEGIN_DECLS
 *
 * Since: 0.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_X11_FILTER_CONTINUE,
  CLUTTER_X11_FILTER_TRANSLATE,
  CLUTTER_X11_FILTER_REMOVE
--- a/clutter/clutter/x11/clutter-xkb-a11y-x11.c
+++ b/clutter/clutter/x11/clutter-xkb-a11y-x11.c
@@ -241,13 +241,8 @@ clutter_device_manager_x11_apply_kbd_a11y_settings (ClutterDeviceManager   *devi
    }

  /* mouse keys */
-  if (clutter_keymap_get_num_lock_state (CLUTTER_KEYMAP (backend_x11->keymap)))
-    {
-      /* Disable mousekeys when NumLock is ON */
-      desc->ctrls->enabled_ctrls &= ~(XkbMouseKeysMask | XkbMouseKeysAccelMask);
-    }
-  else if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                         CLUTTER_A11Y_MOUSE_KEYS_ENABLED, XkbMouseKeysMask | XkbMouseKeysAccelMask))
+  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
+                    CLUTTER_A11Y_MOUSE_KEYS_ENABLED, XkbMouseKeysMask | XkbMouseKeysAccelMask))
    {
      gint mk_max_speed;
      gint mk_accel_time;
--- a/clutter/meson.build
+++ b/clutter/meson.build
@@ -1,5 +1,6 @@
-clutter_includesubdir = join_paths(pkgname, 'clutter')
-clutter_includedir = join_paths(includedir, clutter_includesubdir)
+clutter_includedir = join_paths(pkgincludedir, 'clutter')
+clutter_srcdir = join_paths(top_srcdir, 'clutter')
+clutter_builddir = join_paths(builddir, 'clutter')

 clutter_includepath = include_directories('.', 'clutter')
 clutter_includes = [clutter_includepath, cogl_includepath]
@@ -38,7 +39,6 @@ clutter_pkg_deps = [
 ]

 clutter_pkg_private_deps = [
-  fribidi_dep,
  gdk_pixbuf_dep,
  gthread_dep,
  gmodule_no_export_dep,
--- a/clutter/tests/conform/actor-destroy.c
+++ b/clutter/tests/conform/actor-destroy.c
@@ -114,7 +114,8 @@ test_destroy_destroy (ClutterActor *self)
      test->tex = NULL;
    }

-  g_list_free_full (test->children, (GDestroyNotify) clutter_actor_destroy);
+  g_list_foreach (test->children, (GFunc) clutter_actor_destroy, NULL);
+  g_list_free (test->children);
  test->children = NULL;

  if (CLUTTER_ACTOR_CLASS (test_destroy_parent_class)->destroy)
--- a/clutter/tests/conform/meson.build
+++ b/clutter/tests/conform/meson.build
@@ -1,3 +1,6 @@
+clutter_tests_conform_srcdir = join_paths(clutter_srcdir, 'tests/conform')
+clutter_tests_conform_builddir = join_paths(clutter_builddir, 'tests/conform')
+
 clutter_tests_conform_c_args = [
  '-DG_LOG_DOMAIN="Clutter-Conform"',
  '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
@@ -31,6 +34,7 @@ clutter_conform_tests_general_tests = [
  'binding-pool',
  'color',
  'interval',
+  'model',
  'script-parser',
  'units',
 ]
@@ -49,8 +53,8 @@ clutter_conform_tests += clutter_conform_tests_general_tests
 clutter_conform_tests += clutter_conform_tests_deprecated_tests

 test_env = environment()
-test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+test_env.set('G_TEST_SRCDIR', clutter_tests_conform_srcdir)
+test_env.set('G_TEST_BUILDDIR', clutter_tests_conform_builddir)
 test_env.set('G_ENABLE_DIAGNOSTIC', '0')
 test_env.set('CLUTTER_ENABLE_DIAGNOSTIC', '0')
 test_env.set('CLUTTER_SCALE', '1')
@@ -71,8 +75,7 @@ foreach test : clutter_conform_tests
    install: false,
  )

-  test(test, test_executable,
-    suite: ['clutter', 'clutter/conform'],
+  test('clutter/conform/@0@'.format(test), test_executable,
    env: test_env
  )
 endforeach
--- a/clutter/tests/conform/model.c
+++ b/clutter/tests/conform/model.c
@@ -0,0 +1,528 @@
+#include <stdlib.h>
+#include <string.h>
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+#include <clutter/clutter.h>
+
+typedef struct _ModelData
+{
+  ClutterModel *model;
+
+  guint n_row;
+} ModelData;
+
+typedef struct _ChangedData
+{
+  ClutterModel *model;
+
+  ClutterModelIter *iter;
+
+  guint row;
+  guint n_emissions;
+
+  gint value_check;
+} ChangedData;
+
+enum
+{
+  COLUMN_FOO,   /* G_TYPE_STRING */
+  COLUMN_BAR,   /* G_TYPE_INT */
+
+  N_COLUMNS
+};
+
+static const struct {
+  const gchar *expected_foo;
+  gint expected_bar;
+} base_model[] = {
+  { "String 1", 1 },
+  { "String 2", 2 },
+  { "String 3", 3 },
+  { "String 4", 4 },
+  { "String 5", 5 },
+  { "String 6", 6 },
+  { "String 7", 7 },
+  { "String 8", 8 },
+  { "String 9", 9 },
+};
+
+static const struct {
+  const gchar *expected_foo;
+  gint expected_bar;
+} forward_base[] = {
+  { "String 1", 1 },
+  { "String 2", 2 },
+  { "String 3", 3 },
+  { "String 4", 4 },
+  { "String 5", 5 },
+  { "String 6", 6 },
+  { "String 7", 7 },
+  { "String 8", 8 },
+  { "String 9", 9 },
+};
+
+static const struct {
+  const gchar *expected_foo;
+  gint expected_bar;
+} backward_base[] = {
+  { "String 9", 9 },
+  { "String 8", 8 },
+  { "String 7", 7 },
+  { "String 6", 6 },
+  { "String 5", 5 },
+  { "String 4", 4 },
+  { "String 3", 3 },
+  { "String 2", 2 },
+  { "String 1", 1 },
+};
+
+static const struct {
+  const gchar *expected_foo;
+  gint expected_bar;
+} filter_odd[] = {
+  { "String 1", 1 },
+  { "String 3", 3 },
+  { "String 5", 5 },
+  { "String 7", 7 },
+  { "String 9", 9 },
+};
+
+static const struct {
+  const gchar *expected_foo;
+  gint expected_bar;
+} filter_even[] = {
+  { "String 8", 8 },
+  { "String 6", 6 },
+  { "String 4", 4 },
+  { "String 2", 2 },
+};
+
+static inline void
+compare_iter (ClutterModelIter *iter,
+              const gint        expected_row,
+              const gchar      *expected_foo,
+              const gint        expected_bar)
+{
+  gchar *foo = NULL;
+  gint bar = 0;
+  gint row = 0;
+
+  row = clutter_model_iter_get_row (iter);
+  clutter_model_iter_get (iter,
+                          COLUMN_FOO, &foo,
+                          COLUMN_BAR, &bar,
+                          -1);
+
+  if (g_test_verbose ())
+    g_print ("Row %d => %d: Got [ '%s', '%d' ], expected [ '%s', '%d' ]\n",
+             row, expected_row,
+             foo, bar,
+             expected_foo, expected_bar);
+
+  g_assert_cmpint (row, ==, expected_row);
+  g_assert_cmpstr (foo, ==, expected_foo);
+  g_assert_cmpint (bar, ==, expected_bar);
+
+  g_free (foo);
+}
+
+static void
+on_row_added (ClutterModel     *model,
+              ClutterModelIter *iter,
+              gpointer          data)
+{
+  ModelData *model_data = data;
+
+  compare_iter (iter,
+                model_data->n_row,
+                base_model[model_data->n_row].expected_foo,
+                base_model[model_data->n_row].expected_bar);
+
+  model_data->n_row += 1;
+}
+
+static gboolean
+filter_even_rows (ClutterModel     *model,
+                  ClutterModelIter *iter,
+                  gpointer          dummy G_GNUC_UNUSED)
+{
+  gint bar_value;
+
+  clutter_model_iter_get (iter, COLUMN_BAR, &bar_value, -1);
+
+  if (bar_value % 2 == 0)
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+filter_odd_rows (ClutterModel     *model,
+                 ClutterModelIter *iter,
+                 gpointer          dummy G_GNUC_UNUSED)
+{
+  gint bar_value;
+
+  clutter_model_iter_get (iter, COLUMN_BAR, &bar_value, -1);
+
+  if (bar_value % 2 != 0)
+    return TRUE;
+
+  return FALSE;
+}
+
+static void
+list_model_filter (void)
+{
+  ModelData test_data = { NULL, 0 };
+  ClutterModelIter *iter;
+  gint i;
+
+  test_data.model = clutter_list_model_new (N_COLUMNS,
+                                            G_TYPE_STRING, "Foo",
+                                            G_TYPE_INT,    "Bar");
+  test_data.n_row = 0;
+
+  for (i = 1; i < 10; i++)
+    {
+      gchar *foo = g_strdup_printf ("String %d", i);
+
+      clutter_model_append (test_data.model,
+                            COLUMN_FOO, foo,
+                            COLUMN_BAR, i,
+                            -1);
+
+      g_free (foo);
+    }
+
+  if (g_test_verbose ())
+    g_print ("Forward iteration (filter odd)...\n");
+
+  clutter_model_set_filter (test_data.model, filter_odd_rows, NULL, NULL);
+
+  iter = clutter_model_get_first_iter (test_data.model);
+  g_assert (iter != NULL);
+
+  i = 0;
+  while (!clutter_model_iter_is_last (iter))
+    {
+      compare_iter (iter, i,
+                    filter_odd[i].expected_foo,
+                    filter_odd[i].expected_bar);
+
+      iter = clutter_model_iter_next (iter);
+      i += 1;
+    }
+
+  g_object_unref (iter);
+
+  if (g_test_verbose ())
+    g_print ("Backward iteration (filter even)...\n");
+
+  clutter_model_set_filter (test_data.model, filter_even_rows, NULL, NULL);
+
+  iter = clutter_model_get_last_iter (test_data.model);
+  g_assert (iter != NULL);
+
+  i = 0;
+  do
+    {
+      compare_iter (iter, G_N_ELEMENTS (filter_even) - i - 1,
+                    filter_even[i].expected_foo,
+                    filter_even[i].expected_bar);
+
+      iter = clutter_model_iter_prev (iter);
+      i += 1;
+    }
+  while (!clutter_model_iter_is_first (iter));
+
+  g_object_unref (iter);
+
+  if (g_test_verbose ())
+    g_print ("get_iter_at_row...\n");
+
+  clutter_model_set_filter (test_data.model, filter_odd_rows, NULL, NULL);
+
+  for (i = 0; i < 5; i++)
+    {
+      iter = clutter_model_get_iter_at_row (test_data.model, i);
+      compare_iter (iter, i ,
+                    filter_odd[i].expected_foo,
+                    filter_odd[i].expected_bar);
+      g_object_unref (iter);
+    }
+
+  iter = clutter_model_get_iter_at_row (test_data.model, 5);
+  g_assert (iter == NULL);
+
+  g_object_unref (test_data.model);
+}
+
+static void
+list_model_iterate (void)
+{
+  ModelData test_data = { NULL, 0 };
+  ClutterModelIter *iter;
+  gint i;
+
+  test_data.model = clutter_list_model_new (N_COLUMNS,
+                                            G_TYPE_STRING, "Foo",
+                                            G_TYPE_INT,    "Bar");
+  test_data.n_row = 0;
+
+  g_signal_connect (test_data.model, "row-added",
+                    G_CALLBACK (on_row_added),
+                    &test_data);
+
+  for (i = 1; i < 10; i++)
+    {
+      gchar *foo = g_strdup_printf ("String %d", i);
+
+      clutter_model_append (test_data.model,
+                            COLUMN_FOO, foo,
+                            COLUMN_BAR, i,
+                            -1);
+
+      g_free (foo);
+    }
+
+  if (g_test_verbose ())
+    g_print ("Forward iteration...\n");
+
+  iter = clutter_model_get_first_iter (test_data.model);
+  g_assert (iter != NULL);
+
+  i = 0;
+  while (!clutter_model_iter_is_last (iter))
+    {
+      compare_iter (iter, i,
+                    forward_base[i].expected_foo,
+                    forward_base[i].expected_bar);
+
+      iter = clutter_model_iter_next (iter);
+      i += 1;
+    }
+
+  g_object_unref (iter);
+
+  if (g_test_verbose ())
+    g_print ("Backward iteration...\n");
+
+  iter = clutter_model_get_last_iter (test_data.model);
+  g_assert (iter != NULL);
+
+  i = 0;
+  do
+    {
+      compare_iter (iter, G_N_ELEMENTS (backward_base) - i - 1,
+                    backward_base[i].expected_foo,
+                    backward_base[i].expected_bar);
+
+      iter = clutter_model_iter_prev (iter);
+      i += 1;
+    }
+  while (!clutter_model_iter_is_first (iter));
+
+  compare_iter (iter, G_N_ELEMENTS (backward_base) - i - 1,
+                backward_base[i].expected_foo,
+                backward_base[i].expected_bar);
+
+  g_object_unref (iter);
+
+  g_object_unref (test_data.model);
+}
+
+static void
+list_model_populate (void)
+{
+  ModelData test_data = { NULL, 0 };
+  gint i;
+
+  test_data.model = clutter_list_model_new (N_COLUMNS,
+                                            G_TYPE_STRING, "Foo",
+                                            G_TYPE_INT,    "Bar");
+  test_data.n_row = 0;
+
+  g_signal_connect (test_data.model, "row-added",
+                    G_CALLBACK (on_row_added),
+                    &test_data);
+
+  for (i = 1; i < 10; i++)
+    {
+      gchar *foo = g_strdup_printf ("String %d", i);
+
+      clutter_model_append (test_data.model,
+                            COLUMN_FOO, foo,
+                            COLUMN_BAR, i,
+                            -1);
+
+      g_free (foo);
+    }
+
+  g_object_unref (test_data.model);
+}
+
+static void
+list_model_from_script (void)
+{
+  ClutterScript *script = clutter_script_new ();
+  GObject *model;
+  GError *error = NULL;
+  gchar *test_file;
+  const gchar *name;
+  GType type;
+  ClutterModelIter *iter;
+  GValue value = { 0, };
+
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-model.json", NULL);
+  clutter_script_load_from_file (script, test_file, &error);
+  if (g_test_verbose () && error)
+    g_print ("Error: %s", error->message);
+
+  g_assert_no_error (error);
+
+  model = clutter_script_get_object (script, "test-model");
+
+  g_assert (CLUTTER_IS_MODEL (model));
+  g_assert (clutter_model_get_n_columns (CLUTTER_MODEL (model)) == 3);
+
+  name = clutter_model_get_column_name (CLUTTER_MODEL (model), 0);
+  type = clutter_model_get_column_type (CLUTTER_MODEL (model), 0);
+
+  if (g_test_verbose ())
+    g_print ("column[0]: %s, type: %s\n", name, g_type_name (type));
+
+  g_assert (strcmp (name, "text-column") == 0);
+  g_assert (type == G_TYPE_STRING);
+
+  name = clutter_model_get_column_name (CLUTTER_MODEL (model), 2);
+  type = clutter_model_get_column_type (CLUTTER_MODEL (model), 2);
+
+  if (g_test_verbose ())
+    g_print ("column[2]: %s, type: %s\n", name, g_type_name (type));
+
+  g_assert (strcmp (name, "actor-column") == 0);
+  g_assert (g_type_is_a (type, CLUTTER_TYPE_ACTOR));
+
+  g_assert (clutter_model_get_n_rows (CLUTTER_MODEL (model)) == 3);
+
+  iter = clutter_model_get_iter_at_row (CLUTTER_MODEL (model), 0);
+  clutter_model_iter_get_value (iter, 0, &value);
+  g_assert (G_VALUE_HOLDS_STRING (&value));
+  g_assert (strcmp (g_value_get_string (&value), "text-row-1") == 0);
+  g_value_unset (&value);
+
+  clutter_model_iter_get_value (iter, 1, &value);
+  g_assert (G_VALUE_HOLDS_INT (&value));
+  g_assert (g_value_get_int (&value) == 1);
+  g_value_unset (&value);
+
+  clutter_model_iter_get_value (iter, 2, &value);
+  g_assert (G_VALUE_HOLDS_OBJECT (&value));
+  g_assert (g_value_get_object (&value) == NULL);
+  g_value_unset (&value);
+
+  iter = clutter_model_iter_next (iter);
+  clutter_model_iter_get_value (iter, 2, &value);
+  g_assert (G_VALUE_HOLDS_OBJECT (&value));
+  g_assert (CLUTTER_IS_ACTOR (g_value_get_object (&value)));
+  g_value_unset (&value);
+
+  iter = clutter_model_iter_next (iter);
+  clutter_model_iter_get_value (iter, 2, &value);
+  g_assert (G_VALUE_HOLDS_OBJECT (&value));
+  g_assert (CLUTTER_IS_ACTOR (g_value_get_object (&value)));
+  g_assert (strcmp (clutter_actor_get_name (g_value_get_object (&value)),
+                    "actor-row-3") == 0);
+  g_value_unset (&value);
+  g_object_unref (iter);
+}
+
+static void
+on_row_changed (ClutterModel *model,
+                ClutterModelIter *iter,
+                ChangedData *data)
+{
+  gint value = -1;
+
+  clutter_model_iter_get (iter, COLUMN_BAR, &value, -1);
+
+  if (g_test_verbose ())
+    g_print ("row-changed value-check: %d, expected: %d\n",
+             value, data->value_check);
+
+  g_assert_cmpint (value, ==, data->value_check);
+
+  data->n_emissions += 1;
+}
+
+static void
+list_model_row_changed (void)
+{
+  ChangedData test_data = { NULL, NULL, 0, 0 };
+  GValue value = { 0, };
+  gint i;
+
+  test_data.model = clutter_list_model_new (N_COLUMNS,
+                                            G_TYPE_STRING, "Foo",
+                                            G_TYPE_INT,    "Bar");
+  for (i = 1; i < 10; i++)
+    {
+      gchar *foo = g_strdup_printf ("String %d", i);
+
+      clutter_model_append (test_data.model,
+                            COLUMN_FOO, foo,
+                            COLUMN_BAR, i,
+                            -1);
+
+      g_free (foo);
+    }
+
+  g_signal_connect (test_data.model, "row-changed",
+                    G_CALLBACK (on_row_changed),
+                    &test_data);
+
+  test_data.row = g_random_int_range (0, 9);
+  test_data.iter = clutter_model_get_iter_at_row (test_data.model,
+                                                  test_data.row);
+  g_assert (CLUTTER_IS_MODEL_ITER (test_data.iter));
+
+  test_data.value_check = 47;
+
+  g_value_init (&value, G_TYPE_INT);
+  g_value_set_int (&value, test_data.value_check);
+
+  clutter_model_iter_set_value (test_data.iter, COLUMN_BAR, &value);
+
+  g_value_unset (&value);
+
+  if (g_test_verbose ())
+    g_print ("iter.set_value() emissions: %d, expected: 1\n",
+             test_data.n_emissions);
+
+  g_assert_cmpint (test_data.n_emissions, ==, 1);
+
+  test_data.n_emissions = 0;
+  test_data.value_check = 42;
+
+  clutter_model_iter_set (test_data.iter,
+                          COLUMN_FOO, "changed",
+                          COLUMN_BAR, test_data.value_check,
+                          -1);
+
+  if (g_test_verbose ())
+    g_print ("iter.set() emissions: %d, expected: 1\n",
+             test_data.n_emissions);
+
+  g_assert_cmpint (test_data.n_emissions, ==, 1);
+
+  g_object_unref (test_data.iter);
+  g_object_unref (test_data.model);
+}
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/list-model/populate", list_model_populate)
+  CLUTTER_TEST_UNIT ("/list-model/iterate", list_model_iterate)
+  CLUTTER_TEST_UNIT ("/list-model/filter", list_model_filter)
+  CLUTTER_TEST_UNIT ("/list-model/row-changed", list_model_row_changed)
+  CLUTTER_TEST_UNIT ("/list-model/from-script", list_model_from_script)
+)
--- a/clutter/tests/conform/text.c
+++ b/clutter/tests/conform/text.c
@@ -468,19 +468,6 @@ validate_markup_attributes (ClutterText   *text,

      a = attributes->data;

-      if (a->klass->type == PANGO_ATTR_SCALE)
-        {
-          PangoAttrFloat *scale = (PangoAttrFloat*) a;
-          float resource_scale;
-
-          if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (text), &resource_scale))
-            resource_scale = 1.0;
-
-          g_assert_cmpfloat (scale->value, ==, resource_scale);
-          g_slist_free_full (attributes, (GDestroyNotify) pango_attribute_destroy);
-          continue;
-        }
-
      g_assert (a->klass->type == attr_type);
      g_assert_cmpint (a->start_index, ==, start_index);
      g_assert_cmpint (a->end_index, ==, end_index);
--- a/clutter/tests/conform/timeline.c
+++ b/clutter/tests/conform/timeline.c
@@ -38,7 +38,8 @@ timeline_data_init (TimelineData *data, int timeline_num)
 static void
 timeline_data_destroy (TimelineData *data)
 {
-  g_slist_free_full (data->markers_hit, g_free);
+  g_slist_foreach (data->markers_hit, (GFunc) g_free, NULL);
+  g_slist_free (data->markers_hit);
 }

 static void
--- a/Show More
+++ b/Show More