[cogl/wip/rig: 29/34] xlib: remove deprecated apis

[Robert Bragg <rbragg src gnome org>]

commit e35ec38e41ac959a72f4d8c9e0f93c24a3eccefa
Author: Robert Bragg <robert bragg intel com>
Date:   Mon Mar 17 14:41:53 2014 +0000

    xlib: remove deprecated apis
    
    This removes some deprecated cogl_xlib_ code that depends on a global
    CoglContext. Note: we keep cogl-xlib.h as a top-level header for xlib
    specific apis. Since we now have no longer include cogl-xlib.h
    internally this slightly simplifies the guarding inside the header to
    trigger an error from now on if the header is use internally, as we do
    for cogl.h.

 cogl/Makefile.sources                 |    2 -
 cogl/cogl-xlib-private.h              |   42 ----------------
 cogl/cogl-xlib.c                      |   87 ---------------------------------
 cogl/cogl-xlib.h                      |   41 +--------------
 cogl/winsys/cogl-texture-pixmap-x11.c |    2 +-
 5 files changed, 4 insertions(+), 170 deletions(-)
---
diff --git a/cogl/Makefile.sources b/cogl/Makefile.sources
index 4e4f86d..9e340f3 100644
--- a/cogl/Makefile.sources
+++ b/cogl/Makefile.sources
@@ -297,8 +297,6 @@ cogl_xlib_sources_c = \
        cogl-x11-renderer-private.h \
        cogl-xlib-renderer-private.h \
        cogl-xlib-renderer.c \
-       cogl-xlib.c \
-       cogl-xlib-private.h \
        winsys/cogl-texture-pixmap-x11.c \
        winsys/cogl-texture-pixmap-x11-private.h
 
diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h
index 8d25d82..3131ea2 100644
--- a/cogl/cogl-xlib.h
+++ b/cogl/cogl-xlib.h
@@ -31,56 +31,21 @@
 
 #include <X11/Xlib.h>
 
-/* NB: this is a top-level header that can be included directly but we
- * want to be careful not to define __COGL_H_INSIDE__ when this is
- * included internally while building Cogl itself since
- * __COGL_H_INSIDE__ is used in headers to guard public vs private api
- * definitions
- */
-#ifndef COGL_COMPILATION
+#ifdef COGL_COMPILATION
+#error "<cogl/cogl-xlib.h> shouldn't be included internally"
+#endif
 
 /* Note: When building Cogl .gir we explicitly define
  * __COGL_XLIB_H_INSIDE__ */
 #ifndef __COGL_XLIB_H_INSIDE__
 #define __COGL_XLIB_H_INSIDE__
-#endif
-
-/* Note: When building Cogl .gir we explicitly define
- * __COGL_H_INSIDE__ */
-#ifndef __COGL_H_INSIDE__
 #define __COGL_H_INSIDE__
 #define __COGL_MUST_UNDEF_COGL_H_INSIDE__
 #endif
 
-#endif /* COGL_COMPILATION */
-
 #include <cogl/cogl-types.h>
 #include <cogl/cogl-xlib-renderer.h>
 
-COGL_BEGIN_DECLS
-
-/*
- * cogl_xlib_handle_event:
- * @xevent: pointer to XEvent structure
- *
- * This function processes a single X event; it can be used to hook
- * into external X event retrieval (for example that done by Clutter
- * or GDK).
- *
- * Return value: #CoglFilterReturn. %COGL_FILTER_REMOVE indicates
- * that Cogl has internally handled the event and the caller should
- * do no further processing.  %COGL_FILTER_CONTINUE indicates that
- * Cogl is either not interested in the event, or has used the event
- * to update internal state without taking any exclusive action.
- *
- * Stability: Unstable
- */
-CoglFilterReturn
-cogl_xlib_handle_event (XEvent *xevent);
-
-COGL_END_DECLS
-
-
 /* The gobject introspection scanner seems to parse public headers in
  * isolation which means we need to be extra careful about how we
  * define and undefine __COGL_H_INSIDE__ used to detect when internal
diff --git a/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/winsys/cogl-texture-pixmap-x11.c
index 534f717..9a6b460 100644
--- a/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -53,7 +53,7 @@
 #include "cogl-object-private.h"
 #include "cogl-winsys-private.h"
 #include "cogl-pipeline-opengl-private.h"
-#include "cogl-xlib.h"
+#include "cogl-xlib-renderer.h"
 #include "cogl-error-private.h"
 #include "cogl-texture-gl-private.h"
 #include "cogl-private.h"