[cogl/wip/rig: 19/34] Remove some leftover references to Clutter

[Robert Bragg <rbragg src gnome org>]

commit a4abd2b5ced7a3192651d5ab32171449287e2305
Author: Robert Bragg <robert bragg intel com>
Date:   Thu Mar 13 16:37:25 2014 +0000

    Remove some leftover references to Clutter
    
    Since it's not possible to build Clutter against Cogl master it doesn't
    make sense to have any Clutter specific code.

 cogl-gst/cogl-gst-video-sink.c          |    2 +-
 cogl/Makefile.sources                   |    3 -
 cogl/cogl-clutter-xlib.h                |   46 ----
 cogl/cogl-clutter.c                     |   98 --------
 cogl/cogl-clutter.h                     |   48 ----
 cogl/cogl-xlib.h                        |    1 -
 cogl/cogl.h                             |    3 -
 cogl/cogl.symbols                       |   13 +-
 tests/conform/test-fixtures.c           |   12 -
 tests/conform/test-materials.c          |  253 -------------------
 tests/conform/test-multitexture.c       |  206 ---------------
 tests/conform/test-object.c             |   86 -------
 tests/conform/test-readpixels.c         |  178 -------------
 tests/conform/test-texture-mipmaps.c    |  136 ----------
 tests/conform/test-texture-pixmap-x11.c |  245 ------------------
 tests/conform/test-texture-rectangle.c  |  276 --------------------
 tests/conform/test-viewport.c           |  416 -------------------------------
 17 files changed, 2 insertions(+), 2020 deletions(-)
---
diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c
index b10caf3..9dd48e2 100644
--- a/cogl-gst/cogl-gst-video-sink.c
+++ b/cogl-gst/cogl-gst-video-sink.c
@@ -1229,7 +1229,7 @@ unknown_format:
 
 unhandled_format:
   {
-    GST_ERROR_OBJECT (sink, "Provided caps aren't supported by clutter-gst");
+    GST_ERROR_OBJECT (sink, "Provided caps aren't supported by cogl-gst");
     return FALSE;
   }
 
diff --git a/cogl/Makefile.sources b/cogl/Makefile.sources
index fd37391..4e4f86d 100644
--- a/cogl/Makefile.sources
+++ b/cogl/Makefile.sources
@@ -4,7 +4,6 @@ cogl_public_h = \
        cogl-attribute.h                \
        cogl-bitmap.h           \
        cogl-buffer.h           \
-       cogl-clutter.h                  \
        cogl-color.h                    \
        cogl-context.h          \
        cogl-depth-state.h              \
@@ -253,7 +252,6 @@ cogl_sources_c = \
        cogl-gtype-private.h                  \
        cogl-point-in-poly-private.h            \
        cogl-point-in-poly.c                    \
-       cogl-clutter.c                          \
        cogl-list.c                             \
        cogl-list.h                             \
        winsys/cogl-winsys-stub-private.h       \
@@ -292,7 +290,6 @@ cogl_glib_sources_h = cogl-glib-source.h
 cogl_glib_sources_c = cogl-glib-source.c
 
 cogl_xlib_sources_h = \
-       cogl-clutter-xlib.h \
        cogl-xlib-renderer.h \
        winsys/cogl-texture-pixmap-x11.h \
        cogl-xlib.h
diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h
index 98df9e2..8d25d82 100644
--- a/cogl/cogl-xlib.h
+++ b/cogl/cogl-xlib.h
@@ -55,7 +55,6 @@
 #endif /* COGL_COMPILATION */
 
 #include <cogl/cogl-types.h>
-#include <cogl/cogl-clutter-xlib.h>
 #include <cogl/cogl-xlib-renderer.h>
 
 COGL_BEGIN_DECLS
diff --git a/cogl/cogl.h b/cogl/cogl.h
index b98b301..edcf6ba 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -105,9 +105,6 @@
 #ifdef COGL_HAS_GLIB_SUPPORT
 #include <cogl/cogl-glib-source.h>
 #endif
-/* XXX: This will definitly go away once all the Clutter winsys
- * code has been migrated down into Cogl! */
-#include <cogl/cogl-clutter.h>
 
 /* The gobject introspection scanner seems to parse public headers in
  * isolation which means we need to be extra careful about how we
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index c7039f4..73dd0a4 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -91,14 +91,6 @@ cogl_clip_stack_restore
 cogl_clip_stack_save
 #endif
 
-#ifndef COGL_WINSYS_INTEGRATED
-cogl_clutter_check_extension_CLUTTER
-cogl_clutter_winsys_has_feature_CLUTTER
-#ifdef COGL_HAS_XLIB
-cogl_clutter_winsys_xlib_get_visual_info_CLUTTER
-#endif
-#endif
-
 cogl_color_copy
 cogl_color_equal
 cogl_color_free
@@ -344,9 +336,6 @@ cogl_object_unref
 cogl_offscreen_new_with_texture
 
 cogl_onscreen_add_swap_buffers_callback
-#ifndef COGL_WINSYS_INTEGRATED
-cogl_onscreen_clutter_backend_set_size_CLUTTER
-#endif
 cogl_onscreen_hide
 cogl_onscreen_new
 cogl_onscreen_set_swap_throttled
@@ -632,7 +621,7 @@ cogl_x11_onscreen_set_foreign_window_xid
 
 #ifndef COGL_NO_EXPORT_UNDERSCORE
 /* probably these should not be exported at all, but anyways, for now... */
-/* eventually, this section should disappear (or cogl, cogl-pango, clutter et al */
+/* eventually, this section should disappear (or cogl, cogl-pango et al */
 /* will link without the following) */
 _cogl_atlas_add_reorganize_callback
 _cogl_atlas_copy_rectangle