summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2011-07-13 14:26:05 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2011-07-13 14:26:05 +0100
commit9a3b97b55ea7a97f15d53b5797f3a4ffb84975b8 (patch)
tree786e547b0edd578a38007424ae8784b0b4f50513
parentd67bc235a466bd1f5779bcfac6a8fd2cedd468e6 (diff)
downloadclutter-9a3b97b55ea7a97f15d53b5797f3a4ffb84975b8.tar.gz
Revert "build: Detect the appropriate default flavour"
Ouch, butterfingers and git commit -a. This reverts commit 81e8c8dec902e1e3b6277ebad5804f2321535332.
-rw-r--r--clutter/clutter-actor.c8
-rw-r--r--clutter/clutter-actor.h16
-rw-r--r--configure.ac8
3 files changed, 4 insertions, 28 deletions
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 87d826873..ce0b94d85 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -6110,8 +6110,6 @@ clutter_actor_get_allocation_box (ClutterActor *self,
* The returned rectangle is in pixels.
*
* Since: 0.8
- *
- * Deprecated: 1.8: Use clutter_actor_get_allocation_box() instead.
*/
void
clutter_actor_get_allocation_geometry (ClutterActor *self,
@@ -6246,9 +6244,6 @@ clutter_actor_allocate (ClutterActor *self,
* size, in pixels. This means the untransformed actor will have the
* given geometry. This is the same as calling clutter_actor_set_position()
* and clutter_actor_set_size().
- *
- * Deprecated: 1.8: Use clutter_actor_set_position() and
- * clutter_actor_set_size() instead.
*/
void
clutter_actor_set_geometry (ClutterActor *self,
@@ -6271,9 +6266,6 @@ clutter_actor_set_geometry (ClutterActor *self,
* actor. This is the same as calling clutter_actor_get_position() and
* clutter_actor_get_size(). It tries to "do what you mean" and get the
* requested size and position if the actor's allocation is invalid.
- *
- * Deprecated: 1.8: Use clutter_actor_get_position() and
- * clutter_actor_get_size() instead.
*/
void
clutter_actor_get_geometry (ClutterActor *self,
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 3110a486f..832d901af 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -385,25 +385,15 @@ void clutter_actor_allocate_align_fill (ClutterActor
ClutterAllocationFlags flags);
void clutter_actor_get_allocation_box (ClutterActor *self,
ClutterActorBox *box);
-
-#ifndef CLUTTER_DISABLE_DEPRECATED
void clutter_actor_get_allocation_geometry (ClutterActor *self,
- ClutterGeometry *geom)
- G_GNUC_DEPRECATED_FOR(clutter_actor_get_allocation_box);
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
+ ClutterGeometry *geom);
void clutter_actor_get_allocation_vertices (ClutterActor *self,
ClutterActor *ancestor,
ClutterVertex verts[]);
-#ifndef CLUTTER_DISABLE_DEPRECATED
void clutter_actor_set_geometry (ClutterActor *self,
- const ClutterGeometry *geometry)
- G_GNUC_DEPRECATED;
+ const ClutterGeometry *geometry);
void clutter_actor_get_geometry (ClutterActor *self,
- ClutterGeometry *geometry)
- G_GNUC_DEPRECATED;
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
+ ClutterGeometry *geometry);
void clutter_actor_set_size (ClutterActor *self,
gfloat width,
gfloat height);
diff --git a/configure.ac b/configure.ac
index e93fd0f4f..1179b30e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,9 +94,6 @@ AS_CASE([$host],
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
-AC_CHECK_HEADER([OpenGL/gl.h], [platform_quartz=yes], [platform_quartz=no])
-AM_CONDITIONAL(OS_QUARTZ, [test "$platform_quartz" = "yes"])
-
AC_SUBST(CLUTTER_LT_VERSION)
AC_SUBST(CLUTTER_LT_LDFLAGS)
@@ -170,10 +167,7 @@ AC_SUBST(CLUTTER_LINK_FLAGS)
dnl ========================================================================
# defaults
-AS_IF([test "x$platform_win32" = "xyes"], [CLUTTER_FLAVOUR=win32],
- [test "x$platform_quartz" = "xyes"], [CLUTTER_FLAVOUR=osx],
- [CLUTTER_FLAVOUR=glx])
-
+CLUTTER_FLAVOUR=glx
FLAVOUR_LIBS=""
FLAVOUR_CFLAGS=""
CLUTTER_WINSYS_BASE=