[mutter/wip/wayland-work: 32/63] MetaShapedTexture: don't include private headers in public ones

[Giovanni Campagna <gcampagna src gnome org>]

commit 37b90efe6d1201fe330ed5a63d466083727f08da
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Fri Aug 16 14:23:40 2013 +0200

    MetaShapedTexture: don't include private headers in public ones
    
    Private headers are not installed, so they can't be referenced
    from public ones.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705497

 src/Makefile.am                              |    1 +
 src/compositor/meta-shaped-texture-private.h |   50 ++++++++++++++++++++++++++
 src/compositor/meta-shaped-texture.c         |    1 +
 src/compositor/meta-window-actor.c           |    1 +
 src/meta/meta-shaped-texture.h               |   20 ----------
 src/wayland/meta-wayland-seat.c              |    1 +
 6 files changed, 54 insertions(+), 20 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c1b393..6f00394 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,6 +76,7 @@ libmutter_la_SOURCES =                                \
        compositor/meta-shadow-factory.c        \
        compositor/meta-shadow-factory-private.h        \
        compositor/meta-shaped-texture.c        \
+       compositor/meta-shaped-texture-private.h        \
        compositor/meta-texture-rectangle.c     \
        compositor/meta-texture-rectangle.h     \
        compositor/meta-texture-tower.c         \
diff --git a/src/compositor/meta-shaped-texture-private.h b/src/compositor/meta-shaped-texture-private.h
new file mode 100644
index 0000000..907596a
--- /dev/null
+++ b/src/compositor/meta-shaped-texture-private.h
@@ -0,0 +1,50 @@
+/*
+ * shaped texture
+ *
+ * An actor to draw a texture clipped to a list of rectangles
+ *
+ * Authored By Neil Roberts  <neil linux intel com>
+ *
+ * Copyright (C) 2008 Intel Corporation
+ *               2013 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __META_SHAPED_TEXTURE_PRIVATE_H__
+#define __META_SHAPED_TEXTURE_PRIVATE_H__
+
+#include <meta/meta-shaped-texture.h>
+#ifdef HAVE_WAYLAND
+#include "meta-wayland-private.h"
+#endif
+
+ClutterActor *meta_shaped_texture_new_with_xwindow (Window xwindow);
+#ifdef HAVE_WAYLAND
+ClutterActor *meta_shaped_texture_new_with_wayland_surface  (MetaWaylandSurface *surface);
+void meta_shaped_texture_set_wayland_surface                (MetaShapedTexture  *stex,
+                                                             MetaWaylandSurface *surface);
+MetaWaylandSurface *meta_shaped_texture_get_wayland_surface (MetaShapedTexture *stex);
+#endif
+
+void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
+                                     Pixmap             pixmap);
+#ifdef HAVE_WAYLAND
+void meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture  *stex,
+                                                MetaWaylandBuffer  *buffer);
+#endif
+
+#endif
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index f0279f9..4af53ff 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -33,6 +33,7 @@
 #include <meta/util.h>
 #include "meta-texture-tower.h"
 
+#include "meta-shaped-texture-private.h"
 #ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
 #include <cogl/cogl-wayland-server.h>
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index f7d61f6..5ff27f1 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -28,6 +28,7 @@
 #include "xprops.h"
 
 #include "compositor-private.h"
+#include "meta-shaped-texture-private.h"
 #include "meta-shadow-factory-private.h"
 #include "meta-window-actor-private.h"
 #include "meta-texture-rectangle.h"
diff --git a/src/meta/meta-shaped-texture.h b/src/meta/meta-shaped-texture.h
index 2809b25..0805541 100644
--- a/src/meta/meta-shaped-texture.h
+++ b/src/meta/meta-shaped-texture.h
@@ -29,11 +29,6 @@
 #include <clutter/clutter.h>
 #include <X11/Xlib.h>
 
-#ifdef HAVE_WAYLAND
-#include <wayland-server.h>
-#include "meta-wayland-private.h"
-#endif
-
 G_BEGIN_DECLS
 
 #define META_TYPE_SHAPED_TEXTURE            (meta_shaped_texture_get_type())
@@ -69,14 +64,6 @@ struct _MetaShapedTexture
 
 GType meta_shaped_texture_get_type (void) G_GNUC_CONST;
 
-ClutterActor *meta_shaped_texture_new_with_xwindow (Window xwindow);
-#ifdef HAVE_WAYLAND
-ClutterActor *meta_shaped_texture_new_with_wayland_surface  (MetaWaylandSurface *surface);
-void meta_shaped_texture_set_wayland_surface                (MetaShapedTexture  *stex,
-                                                             MetaWaylandSurface *surface);
-MetaWaylandSurface *meta_shaped_texture_get_wayland_surface (MetaShapedTexture *stex);
-#endif
-
 void meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
                                             gboolean           create_mipmaps);
 
@@ -86,13 +73,6 @@ void meta_shaped_texture_update_area (MetaShapedTexture *stex,
                                       int                width,
                                       int                height);
 
-void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
-                                     Pixmap             pixmap);
-#ifdef HAVE_WAYLAND
-void meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture  *stex,
-                                                MetaWaylandBuffer  *buffer);
-#endif
-
 CoglTexture * meta_shaped_texture_get_texture (MetaShapedTexture *stex);
 
 void meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index 3ea7399..82dcb20 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -35,6 +35,7 @@
 #include "meta-wayland-data-device.h"
 #include "meta-window-actor-private.h"
 #include "meta/meta-shaped-texture.h"
+#include "meta-shaped-texture-private.h"
 #include "meta-wayland-stage.h"
 #include "meta-cursor-tracker-private.h"