[clutter/clutter-1.99] [2.0] Remove X11 deprecated API
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.99] [2.0] Remove X11 deprecated API
- Date: Wed, 22 Jun 2011 12:01:08 +0000 (UTC)
commit bda300e38899d48afff69869fcd04a459fd61a15
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Wed Jun 22 12:49:34 2011 +0100
[2.0] Remove X11 deprecated API
clutter/x11/clutter-backend-x11.c | 23 -----------------------
clutter/x11/clutter-stage-x11.c | 31 -------------------------------
clutter/x11/clutter-x11.h | 8 --------
3 files changed, 0 insertions(+), 62 deletions(-)
---
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index ab1cde2..773fcfa 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -1015,29 +1015,6 @@ 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
- *
- * Since: 0.8
- *
- * 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 ();
-
- return clutter_device_manager_peek_devices (manager);
-}
-
-/**
* clutter_x11_has_xinput:
*
* Gets whether Clutter has XInput support.
diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c
index ab877b9..cfd8428 100644
--- a/clutter/x11/clutter-stage-x11.c
+++ b/clutter/x11/clutter-stage-x11.c
@@ -1185,37 +1185,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
- *
- * Since: 0.4
- */
-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;
ClutterGeometry geom;
diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h
index 262a546..6d51702 100644
--- a/clutter/x11/clutter-x11.h
+++ b/clutter/x11/clutter-x11.h
@@ -106,10 +106,6 @@ Window clutter_x11_get_root_window (void);
XVisualInfo *clutter_x11_get_visual_info (void);
void clutter_x11_set_display (Display * xdpy);
-#ifndef CLUTTER_DISABLE_DEPRECATED
-XVisualInfo *clutter_x11_get_stage_visual (ClutterStage *stage) G_GNUC_DEPRECATED;
-#endif
-
Window clutter_x11_get_stage_window (ClutterStage *stage);
gboolean clutter_x11_set_stage_foreign (ClutterStage *stage,
Window xwindow);
@@ -126,10 +122,6 @@ gboolean clutter_x11_has_event_retrieval (void);
ClutterStage *clutter_x11_get_stage_from_window (Window win);
-#ifndef CLUTTER_DISABLE_DEPRECATED
-const GSList* clutter_x11_get_input_devices (void) G_GNUC_DEPRECATED;
-#endif
-
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]