[clutter/wip/clutter-1.99: 41/47] 2.0: Remove deprecated symbols from the tree



commit 296e1e1f5af440aac829b6182638521bb5629abf
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Oct 7 21:48:02 2012 +0100

    2.0: Remove deprecated symbols from the tree
    
    And fix the fallout.

 clutter/clutter-enums.h                            |   78 +-
 clutter/clutter-group.h                            |   95 -
 clutter/clutter-main.c                             |   27 +-
 clutter/clutter-main.h                             |    2 -
 clutter/clutter-master-clock.c                     |    4 +-
 clutter/clutter-private.h                          |    1 +
 clutter/clutter-script.c                           |    3 -
 clutter/clutter-stage.h                            |    2 +-
 clutter/clutter-texture.h                          |  128 -
 clutter/clutter-types.h                            |    9 -
 clutter/clutter.h                                  |    2 -
 clutter/clutter.symbols                            |    5 -
 clutter/deprecated/clutter-actor-deprecated.c      |  411 ---
 clutter/deprecated/clutter-actor.h                 |  161 -
 clutter/deprecated/clutter-alpha.c                 |  959 ------
 clutter/deprecated/clutter-alpha.h                 |  144 -
 clutter/deprecated/clutter-animatable.h            |   47 -
 clutter/deprecated/clutter-animation.c             | 2663 -----------------
 clutter/deprecated/clutter-animation.h             |  206 --
 clutter/deprecated/clutter-animator.c              | 2175 --------------
 clutter/deprecated/clutter-animator.h              |  186 --
 clutter/deprecated/clutter-backend.h               |   64 -
 clutter/deprecated/clutter-behaviour-depth.c       |  309 --
 clutter/deprecated/clutter-behaviour-depth.h       |  101 -
 clutter/deprecated/clutter-behaviour-ellipse.c     | 1068 -------
 clutter/deprecated/clutter-behaviour-ellipse.h     |  159 -
 clutter/deprecated/clutter-behaviour-opacity.c     |  322 --
 clutter/deprecated/clutter-behaviour-opacity.h     |  115 -
 clutter/deprecated/clutter-behaviour-path.c        |  477 ---
 clutter/deprecated/clutter-behaviour-path.h        |  135 -
 clutter/deprecated/clutter-behaviour-rotate.c      |  697 -----
 clutter/deprecated/clutter-behaviour-rotate.h      |  119 -
 clutter/deprecated/clutter-behaviour-scale.c       |  443 ---
 clutter/deprecated/clutter-behaviour-scale.h       |  107 -
 clutter/deprecated/clutter-behaviour.c             |  669 -----
 clutter/deprecated/clutter-behaviour.h             |  170 --
 clutter/deprecated/clutter-bin-layout.h            |   56 -
 clutter/deprecated/clutter-box.c                   |  737 -----
 clutter/deprecated/clutter-box.h                   |  143 -
 clutter/deprecated/clutter-cairo-texture.c         | 1179 --------
 clutter/deprecated/clutter-cairo-texture.h         |  139 -
 clutter/deprecated/clutter-container.h             |   93 -
 clutter/deprecated/clutter-fixed.c                 |  205 --
 clutter/deprecated/clutter-fixed.h                 |   97 -
 clutter/deprecated/clutter-frame-source.c          |  267 --
 clutter/deprecated/clutter-frame-source.h          |   49 -
 clutter/deprecated/clutter-group.c                 |  564 ----
 clutter/deprecated/clutter-group.h                 |   62 -
 .../deprecated/clutter-input-device-deprecated.c   |   38 -
 clutter/deprecated/clutter-input-device.h          |   41 -
 clutter/deprecated/clutter-keysyms.h               | 2306 --------------
 .../deprecated/clutter-layout-manager-deprecated.c |   89 -
 clutter/deprecated/clutter-main.h                  |   96 -
 clutter/deprecated/clutter-media.c                 |  665 ----
 clutter/deprecated/clutter-media.h                 |  121 -
 clutter/deprecated/clutter-rectangle.c             |  559 ----
 clutter/deprecated/clutter-rectangle.h             |  117 -
 clutter/deprecated/clutter-score.c                 | 1168 --------
 clutter/deprecated/clutter-score.h                 |  144 -
 clutter/deprecated/clutter-shader.c                |  942 ------
 clutter/deprecated/clutter-shader.h                |  182 --
 clutter/deprecated/clutter-stage-manager.h         |   42 -
 clutter/deprecated/clutter-stage.h                 |  102 -
 clutter/deprecated/clutter-state.c                 | 2314 --------------
 clutter/deprecated/clutter-state.h                 |  187 --
 clutter/deprecated/clutter-texture.c               | 3156 --------------------
 clutter/deprecated/clutter-texture.h               |  138 -
 clutter/deprecated/clutter-timeline.h              |   41 -
 clutter/deprecated/clutter-timeout-interval.c      |  142 -
 clutter/deprecated/clutter-timeout-interval.h      |   58 -
 clutter/deprecated/clutter-timeout-pool.c          |  500 ----
 clutter/deprecated/clutter-timeout-pool.h          |   69 -
 clutter/deprecated/clutter-util.h                  |   40 -
 clutter/gdk/clutter-stage-gdk.h                    |    1 -
 clutter/x11/clutter-backend-x11.c                  |   28 +-
 clutter/x11/clutter-device-manager-xi2.c           |    1 +
 clutter/x11/clutter-stage-x11.c                    |   31 -
 clutter/x11/clutter-stage-x11.h                    |    3 -
 clutter/x11/clutter-x11.h                          |   11 +-
 79 files changed, 30 insertions(+), 29156 deletions(-)
---
diff --git a/clutter/clutter-enums.h b/clutter/clutter-enums.h
index fc40748..456de75 100644
--- a/clutter/clutter-enums.h
+++ b/clutter/clutter-enums.h
@@ -31,38 +31,6 @@
 G_BEGIN_DECLS
 
 /**
- * ClutterGravity:
- * @CLUTTER_GRAVITY_NONE: Do not apply any gravity
- * @CLUTTER_GRAVITY_NORTH: Scale from topmost downwards
- * @CLUTTER_GRAVITY_NORTH_EAST: Scale from the top right corner
- * @CLUTTER_GRAVITY_EAST: Scale from the right side
- * @CLUTTER_GRAVITY_SOUTH_EAST: Scale from the bottom right corner
- * @CLUTTER_GRAVITY_SOUTH: Scale from the bottom upwards
- * @CLUTTER_GRAVITY_SOUTH_WEST: Scale from the bottom left corner
- * @CLUTTER_GRAVITY_WEST: Scale from the left side
- * @CLUTTER_GRAVITY_NORTH_WEST: Scale from the top left corner
- * @CLUTTER_GRAVITY_CENTER: Scale from the center.
- *
- * Gravity of the scaling operations. When a gravity different than
- * %CLUTTER_GRAVITY_NONE is used, an actor is scaled keeping the position
- * of the specified portion at the same coordinates.
- *
- *
- */
-typedef enum { /*< prefix=CLUTTER_GRAVITY >*/
-  CLUTTER_GRAVITY_NONE       = 0,
-  CLUTTER_GRAVITY_NORTH,
-  CLUTTER_GRAVITY_NORTH_EAST,
-  CLUTTER_GRAVITY_EAST,
-  CLUTTER_GRAVITY_SOUTH_EAST,
-  CLUTTER_GRAVITY_SOUTH,
-  CLUTTER_GRAVITY_SOUTH_WEST,
-  CLUTTER_GRAVITY_WEST,
-  CLUTTER_GRAVITY_NORTH_WEST,
-  CLUTTER_GRAVITY_CENTER
-} ClutterGravity;
-
-/**
  * ClutterRotateAxis:
  * @CLUTTER_X_AXIS: Rotate around the X axis
  * @CLUTTER_Y_AXIS: Rotate around the Y axis
@@ -161,37 +129,31 @@ typedef enum { /*< prefix=CLUTTER_REQUEST >*/
  * @CLUTTER_EASE_IN_OUT_BOUNCE: exponentially decaying parabolic (bounce)
  *   tweening, with bounce on both ends
  * @CLUTTER_STEPS: parametrized step function; see clutter_timeline_set_step_progress()
- *   for further details. (Since 1.12)
+ *   for further details.
  * @CLUTTER_STEP_START: equivalent to %CLUTTER_STEPS with a number of steps
- *   equal to 1, and a step mode of %CLUTTER_STEP_MODE_START. (Since 1.12)
+ *   equal to 1, and a step mode of %CLUTTER_STEP_MODE_START.
  * @CLUTTER_STEP_END: equivalent to %CLUTTER_STEPS with a number of steps
- *   equal to 1, and a step mode of %CLUTTER_STEP_MODE_END. (Since 1.12)
+ *   equal to 1, and a step mode of %CLUTTER_STEP_MODE_END.
  * @CLUTTER_CUBIC_BEZIER: cubic bezier between (0, 0) and (1, 1) with two
- *   control points; see clutter_timeline_set_cubic_bezier_progress(). (Since 1.12)
+ *   control points; see clutter_timeline_set_cubic_bezier_progress().
  * @CLUTTER_EASE: equivalent to %CLUTTER_CUBIC_BEZIER with control points
- *   in (0.25, 0.1) and (0.25, 1.0). (Since 1.12)
+ *   in (0.25, 0.1) and (0.25, 1.0).
  * @CLUTTER_EASE_IN: equivalent to %CLUTTER_CUBIC_BEZIER with control points
- *   in (0.42, 0) and (1.0, 1.0). (Since 1.12)
+ *   in (0.42, 0) and (1.0, 1.0).
  * @CLUTTER_EASE_OUT: equivalent to %CLUTTER_CUBIC_BEZIER with control points
- *   in (0, 0) and (0.58, 1.0). (Since 1.12)
+ *   in (0, 0) and (0.58, 1.0).
  * @CLUTTER_EASE_IN_OUT: equivalent to %CLUTTER_CUBIC_BEZIER with control points
- *   in (0.42, 0) and (0.58, 1.0). (Since 1.12)
- * @CLUTTER_ANIMATION_LAST: last animation mode, used as a guard for
- *   registered global alpha functions
+ *   in (0.42, 0) and (0.58, 1.0).
+ * @CLUTTER_ANIMATION_LAST: last animation mode, used as a guard when enumerating
+ *
+ * The animation modes used by #ClutterTimeline.
  *
- * The animation modes used by #ClutterAlpha and #ClutterAnimation. This
- * enumeration can be expanded in later versions of Clutter.
+ * This enumeration can be expanded in later versions of Clutter.
  *
  * <figure id="easing-modes">
  *   <title>Easing modes provided by Clutter</title>
  *   <graphic fileref="easing-modes.png" format="PNG"/>
  * </figure>
- *
- * Every global alpha function registered using clutter_alpha_register_func()
- * or clutter_alpha_register_closure() will have a logical id greater than
- * %CLUTTER_ANIMATION_LAST.
- *
- *
  */
 typedef enum {
   CLUTTER_CUSTOM_MODE = 0,
@@ -261,7 +223,7 @@ typedef enum {
   CLUTTER_EASE_OUT,
   CLUTTER_EASE_IN_OUT,
 
-  /* guard, before registered alpha functions */
+  /* guard */
   CLUTTER_ANIMATION_LAST
 } ClutterAnimationMode;
 
@@ -453,20 +415,6 @@ typedef enum { /*< prefix=CLUTTER_ALIGN >*/
 } ClutterAlignAxis;
 
 /**
- * ClutterInterpolation:
- * @CLUTTER_INTERPOLATION_LINEAR: linear interpolation
- * @CLUTTER_INTERPOLATION_CUBIC: cubic interpolation
- *
- * The mode of interpolation between key frames
- *
- *
- */
-typedef enum {
-  CLUTTER_INTERPOLATION_LINEAR,
-  CLUTTER_INTERPOLATION_CUBIC
-} ClutterInterpolation;
-
-/**
  * ClutterBindCoordinate:
  * @CLUTTER_BIND_X: Bind the X coordinate
  * @CLUTTER_BIND_Y: Bind the Y coordinate
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index ff72240..2fe1701 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -467,6 +467,14 @@ _clutter_context_get_show_fps (void)
   return context->show_fps;
 }
 
+guint
+_clutter_context_get_frame_rate (void)
+{
+  ClutterMainContext *context = _clutter_context_get_default ();
+
+  return context->frame_rate;
+}
+
 /**
  * clutter_get_accessibility_enabled:
  *
@@ -2588,25 +2596,6 @@ clutter_base_init (void)
     }
 }
 
-/**
- * clutter_get_default_frame_rate:
- *
- * Retrieves the default frame rate. See clutter_set_default_frame_rate().
- *
- * Return value: the default frame rate
- *
- *
- */
-guint
-clutter_get_default_frame_rate (void)
-{
-  ClutterMainContext *context;
-
-  context = _clutter_context_get_default ();
-
-  return context->frame_rate;
-}
-
 static void
 on_grab_actor_destroy (ClutterActor       *actor,
                        ClutterInputDevice *device)
diff --git a/clutter/clutter-main.h b/clutter/clutter-main.h
index 2b0bfa7..ff46eb1 100644
--- a/clutter/clutter-main.h
+++ b/clutter/clutter-main.h
@@ -138,8 +138,6 @@ PangoFontMap *          clutter_get_font_map                    (void);
 
 ClutterTextDirection    clutter_get_default_text_direction      (void);
 
-guint                   clutter_get_default_frame_rate          (void);
-
 G_END_DECLS
 
 #endif /* _CLUTTER_MAIN_H__ */
diff --git a/clutter/clutter-master-clock.c b/clutter/clutter-master-clock.c
index 32655ee..585d4d7 100644
--- a/clutter/clutter-master-clock.c
+++ b/clutter/clutter-master-clock.c
@@ -237,12 +237,12 @@ master_clock_next_frame_delay (ClutterMasterClock *master_clock)
       return 0;
     }
 
-  next += (1000000L / clutter_get_default_frame_rate ());
+  next += (1000000L / _clutter_context_get_frame_rate ());
 
   if (next <= now)
     {
       CLUTTER_NOTE (SCHEDULER, "Less than %lu microsecs",
-                    1000000L / (gulong) clutter_get_default_frame_rate ());
+                    1000000L / (gulong) _clutter_context_get_frame_rate ());
 
       return 0;
     }
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index 1d28ee0..d24d693 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -211,6 +211,7 @@ guint32                 _clutter_context_acquire_id                     (gpointe
 void                    _clutter_context_release_id                     (guint32       id_);
 gboolean                _clutter_context_get_motion_events_enabled      (void);
 gboolean                _clutter_context_get_show_fps                   (void);
+guint                   _clutter_context_get_frame_rate                 (void);
 
 const gchar *_clutter_gettext (const gchar *str);
 
diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index 5ef8d8f..00c2b52 100644
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -131,11 +131,8 @@
 #include <glib-object.h>
 #include <gmodule.h>
 
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-
 #include "clutter-actor.h"
 #include "clutter-stage.h"
-#include "clutter-texture.h"
 
 #include "clutter-script.h"
 #include "clutter-script-private.h"
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index bc37d0a..39cd13c 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -29,7 +29,7 @@
 #define __CLUTTER_STAGE_H__
 
 #include <clutter/clutter-types.h>
-#include <clutter/clutter-group.h>
+#include <clutter/clutter-actor.h>
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index 5f44467..b38e41b 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -87,11 +87,6 @@ typedef struct _ClutterRect                     ClutterRect;
 typedef struct _ClutterSize                     ClutterSize;
 typedef struct _ClutterVertex                   ClutterVertex;
 
-typedef struct _ClutterAlpha            	ClutterAlpha;
-typedef struct _ClutterAnimation                ClutterAnimation;
-typedef struct _ClutterAnimator         	ClutterAnimator;
-typedef struct _ClutterState            	ClutterState;
-
 typedef struct _ClutterInputDevice              ClutterInputDevice;
 
 typedef CoglMatrix                              ClutterMatrix;
@@ -108,10 +103,6 @@ typedef union _ClutterEvent                     ClutterEvent;
  */
 typedef struct _ClutterEventSequence            ClutterEventSequence;
 
-typedef struct _ClutterFog                      ClutterFog; /* deprecated */
-typedef struct _ClutterBehaviour                ClutterBehaviour; /* deprecated */
-typedef struct _ClutterShader                   ClutterShader; /* deprecated */
-
 /**
  * ClutterPaintVolume:
  *
diff --git a/clutter/clutter.h b/clutter/clutter.h
index 76a94bc..b261d1f 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -67,7 +67,6 @@
 #include "clutter-flow-layout.h"
 #include "clutter-gesture-action.h"
 #include "clutter-grid-layout.h"
-#include "clutter-group.h"
 #include "clutter-image.h"
 #include "clutter-input-device.h"
 #include "clutter-interval.h"
@@ -99,7 +98,6 @@
 #include "clutter-stage.h"
 #include "clutter-stage-manager.h"
 #include "clutter-table-layout.h"
-#include "clutter-texture.h"
 #include "clutter-text.h"
 #include "clutter-timeline.h"
 #include "clutter-transition-group.h"
diff --git a/clutter/clutter.symbols b/clutter/clutter.symbols
index e1ecca6..03c609c 100644
--- a/clutter/clutter.symbols
+++ b/clutter/clutter.symbols
@@ -514,7 +514,6 @@ clutter_get_accessibility_enabled
 clutter_get_current_event
 clutter_get_current_event_time
 clutter_get_default_backend
-clutter_get_default_frame_rate
 clutter_get_default_text_direction
 clutter_get_font_map
 clutter_get_keyboard_grab
@@ -524,7 +523,6 @@ clutter_get_pointer_grab
 clutter_get_script_id
 clutter_grab_keyboard
 clutter_grab_pointer
-clutter_gravity_get_type
 clutter_grid_child_get_type
 clutter_grid_layout_get_type
 clutter_grid_layout_new
@@ -557,7 +555,6 @@ clutter_init
 clutter_init_error_get_type
 clutter_init_error_quark
 clutter_init_with_args
-clutter_interpolation_get_type
 clutter_interval_clone
 clutter_interval_compute
 clutter_interval_compute_value
@@ -1175,10 +1172,8 @@ clutter_x11_filter_return_get_type
 clutter_x11_get_current_event_time
 clutter_x11_get_default_display
 clutter_x11_get_default_screen
-clutter_x11_get_input_devices
 clutter_x11_get_root_window
 clutter_x11_get_stage_from_window
-clutter_x11_get_stage_visual
 clutter_x11_get_stage_window
 clutter_x11_get_use_argb_visual
 clutter_x11_get_visual_info
diff --git a/clutter/gdk/clutter-stage-gdk.h b/clutter/gdk/clutter-stage-gdk.h
index 4004955..6f18097 100644
--- a/clutter/gdk/clutter-stage-gdk.h
+++ b/clutter/gdk/clutter-stage-gdk.h
@@ -23,7 +23,6 @@
 #ifndef __CLUTTER_STAGE_GDK_H__
 #define __CLUTTER_STAGE_GDK_H__
 
-#include <clutter/clutter-group.h>
 #include <clutter/clutter-stage.h>
 #include <gdk/gdk.h>
 
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index bf32261..904ac0a 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -62,6 +62,7 @@
 #include <cogl/cogl-xlib.h>
 
 #include "clutter-backend.h"
+#include "clutter-color.h"
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
 #include "clutter-event-private.h"
@@ -1167,39 +1168,12 @@ clutter_x11_remove_filter (ClutterX11FilterFunc func,
 }
 
 /**
- * clutter_x11_get_input_devices:
- *
- * Retrieves a pointer to the list of input devices
- *
- * Deprecated: 1.2: Use clutter_device_manager_peek_devices() instead
- *
- *
- *
- * Return value: (transfer none) (element-type Clutter.InputDevice): a
- *   pointer to the internal list of input devices; the returned list is
- *   owned by Clutter and should not be modified or freed
- */
-const GSList *
-clutter_x11_get_input_devices (void)
-{
-  ClutterDeviceManager *manager;
-
-  manager = clutter_device_manager_get_default ();
-  if (manager == NULL)
-    return NULL;
-
-  return clutter_device_manager_peek_devices (manager);
-}
-
-/**
  * clutter_x11_has_xinput:
  *
  * Gets whether Clutter has XInput support.
  *
  * Return value: %TRUE if Clutter was compiled with XInput support
  *   and XInput support is available at run time.
- *
- *
  */
 gboolean
 clutter_x11_has_xinput (void)
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index 4250644..2db8940 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -36,6 +36,7 @@
 #include "clutter-device-manager-private.h"
 #include "clutter-event-private.h"
 #include "clutter-event-translator.h"
+#include "clutter-keysyms.h"
 #include "clutter-stage-private.h"
 #include "clutter-private.h"
 
diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c
index 2782a68..eae1855 100644
--- a/clutter/x11/clutter-stage-x11.c
+++ b/clutter/x11/clutter-stage-x11.c
@@ -1280,37 +1280,6 @@ clutter_x11_get_stage_from_window (Window win)
   return NULL;
 }
 
-/**
- * clutter_x11_get_stage_visual: (skip)
- * @stage: a #ClutterStage
- *
- * Returns an XVisualInfo suitable for creating a foreign window for the given
- * stage. NOTE: It doesn't do as the name may suggest, which is return the
- * XVisualInfo that was used to create an existing window for the given stage.
- *
- * XXX: It might be best to deprecate this function and replace with something
- * along the lines of clutter_backend_x11_get_foreign_visual () or perhaps
- * clutter_stage_x11_get_foreign_visual ()
- *
- * Return value: (transfer full): An XVisualInfo suitable for creating a
- *   foreign stage. Use XFree() to free the returned value instead
- *
- * Deprecated: 1.2: Use clutter_x11_get_visual_info() instead
- *
- *
- */
-XVisualInfo *
-clutter_x11_get_stage_visual (ClutterStage *stage)
-{
-  ClutterBackend *backend = clutter_get_default_backend ();
-  ClutterBackendX11 *backend_x11;
-
-  g_return_val_if_fail (CLUTTER_IS_BACKEND_X11 (backend), NULL);
-  backend_x11 = CLUTTER_BACKEND_X11 (backend);
-
-  return _clutter_backend_x11_get_visual_info (backend_x11);
-}
-
 typedef struct {
   ClutterStageX11 *stage_x11;
   cairo_rectangle_int_t geom;
diff --git a/clutter/x11/clutter-stage-x11.h b/clutter/x11/clutter-stage-x11.h
index 7e0b244..82d9a99 100644
--- a/clutter/x11/clutter-stage-x11.h
+++ b/clutter/x11/clutter-stage-x11.h
@@ -22,10 +22,7 @@
 #ifndef __CLUTTER_STAGE_X11_H__
 #define __CLUTTER_STAGE_X11_H__
 
-#include <clutter/clutter-group.h>
 #include <clutter/clutter-stage.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 
 #include "clutter-backend-x11.h"
 #include "cogl/clutter-stage-cogl.h"
diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h
index 41ec8d8..f57e622 100644
--- a/clutter/x11/clutter-x11.h
+++ b/clutter/x11/clutter-x11.h
@@ -38,11 +38,12 @@
 #define __CLUTTER_X11_H__
 
 #include <glib.h>
+
+#include <clutter/clutter-types.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
-#include <clutter/clutter.h>
-#include <clutter/x11/clutter-x11-texture-pixmap.h>
 
 G_BEGIN_DECLS
 
@@ -106,9 +107,6 @@ Window   clutter_x11_get_root_window     (void);
 XVisualInfo *clutter_x11_get_visual_info (void);
 void     clutter_x11_set_display         (Display * xdpy);
 
-CLUTTER_DEPRECATED_FOR(clutter_x11_get_visual_info)
-XVisualInfo *clutter_x11_get_stage_visual  (ClutterStage *stage);
-
 Window       clutter_x11_get_stage_window  (ClutterStage *stage);
 gboolean     clutter_x11_set_stage_foreign (ClutterStage *stage,
                                             Window        xwindow);
@@ -125,9 +123,6 @@ gboolean clutter_x11_has_event_retrieval (void);
 
 ClutterStage *clutter_x11_get_stage_from_window (Window win);
 
-CLUTTER_DEPRECATED_FOR(clutter_device_manager_peek_devices)
-const GSList* clutter_x11_get_input_devices (void);
-
 void     clutter_x11_enable_xinput (void);
 gboolean clutter_x11_has_xinput (void);
 



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