[mutter] configure: Require Clutter 1.9.10
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] configure: Require Clutter 1.9.10
- Date: Thu, 16 Feb 2012 21:47:33 +0000 (UTC)
commit 0dab6df25acd719f47f618f32cd9b862d5fa3fc9
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Feb 10 10:26:28 2012 -0500
configure: Require Clutter 1.9.10
We depend on API introduced in Clutter 1.9.10. Additionally, remove
a compatibility fallback that isn't needed anymore.
configure.in | 2 +-
src/compositor/meta-window-group.c | 21 +--------------------
2 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/configure.in b/configure.in
index dff55fc..fa82463 100644
--- a/configure.in
+++ b/configure.in
@@ -178,7 +178,7 @@ else
AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
fi
-CLUTTER_VERSION=1.7.5
+CLUTTER_VERSION=1.9.10
CLUTTER_PACKAGE=clutter-1.0
AC_SUBST(CLUTTER_PACKAGE)
if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
diff --git a/src/compositor/meta-window-group.c b/src/compositor/meta-window-group.c
index 491afe9..b786765 100644
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -101,25 +101,6 @@ actor_is_untransformed (ClutterActor *actor,
return TRUE;
}
-#if CLUTTER_CHECK_VERSION(1, 9, 0)
-#define has_effects clutter_actor_has_effects
-#else
-
-static gboolean
-has_effects(ClutterActor *actor)
-{
- GList *list;
- gboolean ret;
-
- list = clutter_actor_get_effects (actor);
- ret = list != NULL;
- g_list_free (list);
-
- return ret;
-}
-
-#endif
-
static void
meta_window_group_paint (ClutterActor *actor)
{
@@ -180,7 +161,7 @@ meta_window_group_paint (ClutterActor *actor)
* as well for the same reason, but omitted for simplicity in the
* hopes that no-one will do that.
*/
- if (has_effects (l->data))
+ if (clutter_actor_has_effects (l->data))
continue;
if (META_IS_WINDOW_ACTOR (l->data))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]