[Cogl] [PATCH 2/2] x11: Remove cogl_xlib_{get,set}_display()

[Damien Lespiau]

From: Damien Lespiau <damien.lespiau at intel.com>

These functions have been replaced by equivalent functions on the
renderer.

Note that cogl_xlib_set_display() was a no-op anyway as
_cogl_xlib_display was never used.
---
 cogl/cogl-xlib.c  |   26 --------------------------
 cogl/cogl-xlib.h  |   24 ------------------------
 cogl/cogl.symbols |    2 --
 3 files changed, 0 insertions(+), 52 deletions(-)

diff --git a/cogl/cogl-xlib.c b/cogl/cogl-xlib.c
index f68dd2d..853e48e 100644
--- a/cogl/cogl-xlib.c
+++ b/cogl/cogl-xlib.c
@@ -44,32 +44,6 @@
 
 #include "cogl-xlib.h"
 
-/* FIXME: when we remove the last X11 based Clutter backend then we
- * will get rid of these functions and instead rely on the equivalent
- * _cogl_xlib_renderer API
- */
-
-/* This can't be in the Cogl context because it can be set before
-   context is created */
-static Display *_cogl_xlib_display = NULL;
-
-Display *
-cogl_xlib_get_display (void)
-{
-  _COGL_GET_CONTEXT (ctx, NULL);
-
-  return cogl_xlib_renderer_get_display (ctx->display->renderer);
-}
-
-void
-cogl_xlib_set_display (Display *display)
-{
-  /* This can only be called once before the Cogl context is created */
-  g_assert (_cogl_xlib_display == NULL);
-
-  _cogl_xlib_display = display;
-}
-
 /* These three functions are wrappers around the equivalent renderer
    functions. They can be removed once all xlib-based backends in
    Clutter know about the renderer */
diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h
index 079a322..e9f19d4 100644
--- a/cogl/cogl-xlib.h
+++ b/cogl/cogl-xlib.h
@@ -36,30 +36,6 @@
 G_BEGIN_DECLS
 
 /*
- * cogl_xlib_get_display:
- *
- * Return value: the Xlib display that will be used by the Xlib winsys
- * backend. The display needs to be set with _cogl_xlib_set_display()
- * before this function is called.
- *
- * Stability: Unstable
- */
-Display *
-cogl_xlib_get_display (void);
-
-/*
- * cogl_xlib_set_display:
- *
- * Sets the Xlib display that Cogl will use for the Xlib winsys
- * backend. This function should eventually go away when Cogl gains a
- * more complete winsys abstraction.
- *
- * Stability: Unstable
- */
-void
-cogl_xlib_set_display (Display *display);
-
-/*
  * cogl_xlib_handle_event:
  * @xevent: pointer to XEvent structure
  *
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index da8f658..4849327 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -629,7 +629,6 @@ cogl_win32_renderer_remove_filter
 #endif
 
 #ifdef COGL_HAS_XLIB
-cogl_xlib_get_display
 cogl_xlib_handle_event
 cogl_xlib_renderer_add_filter
 cogl_xlib_renderer_get_display
@@ -638,7 +637,6 @@ cogl_xlib_renderer_handle_event
 cogl_xlib_renderer_remove_filter
 cogl_xlib_renderer_set_event_retrieval_enabled
 cogl_xlib_renderer_set_foreign_display
-cogl_xlib_set_display
 #endif
 
 #ifdef COGL_HAS_X11
-- 
1.7.7.5