From d62d780a9526c4d4d739983be04c6c82146d3ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 16 Jun 2016 15:04:40 -0400 Subject: Remove cogl-1.0 vs cogl-2.0 vs cogl experimental API split Mutter (and libmutter users) are the only users of this version of cogl, and will more or less only use the cogl-1.0, cogl-2.0 and cogl experimental API variants, and having the possibility of having different API versions of the same API depending on what file includes it is error prone and confusing. Lets just remove the possibility of having different versions of the same API. https://bugzilla.gnome.org/show_bug.cgi?id=768977 --- clutter/clutter/clutter-actor.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'clutter/clutter/clutter-actor.h') diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h index bac78c1b3..0c5a08c8c 100644 --- a/clutter/clutter/clutter-actor.h +++ b/clutter/clutter/clutter-actor.h @@ -856,8 +856,6 @@ CLUTTER_AVAILABLE_IN_1_10 void clutter_actor_remove_all_transitions (ClutterActor *self); -/* Experimental API */ -#ifdef CLUTTER_ENABLE_EXPERIMENTAL_API CLUTTER_AVAILABLE_IN_1_16 gboolean clutter_actor_has_mapped_clones (ClutterActor *self); CLUTTER_AVAILABLE_IN_1_22 @@ -865,7 +863,6 @@ void clutter_actor_set_opacity_override gint opacity); CLUTTER_AVAILABLE_IN_1_22 gint clutter_actor_get_opacity_override (ClutterActor *self); -#endif /** * ClutterActorCreateChildFunc: -- cgit v1.2.1