[mutter/wip/wayland] shaped-texture: remove leftover conditional class parent
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/wayland] shaped-texture: remove leftover conditional class parent
- Date: Wed, 17 Jul 2013 11:49:31 +0000 (UTC)
commit 14fa5b5e28d7fddba1ea9e60b6cb7a793a877b35
Author: Robert Bragg <robert linux intel com>
Date: Fri Jun 28 23:33:23 2013 +0100
shaped-texture: remove leftover conditional class parent
When mutter was adapted to support wayland 0.85 it depended on a
ClutterWaylandSurface actor and the MetaShapedTexture class had a build
time condition to either subclass ClutterWaylandSurface or ClutterActor
depending on whether wayland support was being built. The latest wayland
support is handled at runtime but I hadn't updated the
ShapedTextureClass struct definition.
TODO: squash this patch into:
"wayland: Adds basic hybrid X + Wayland support"
src/meta/meta-shaped-texture.h | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/src/meta/meta-shaped-texture.h b/src/meta/meta-shaped-texture.h
index 7774ca0..2809b25 100644
--- a/src/meta/meta-shaped-texture.h
+++ b/src/meta/meta-shaped-texture.h
@@ -32,7 +32,6 @@
#ifdef HAVE_WAYLAND
#include <wayland-server.h>
#include "meta-wayland-private.h"
-#include <clutter/wayland/clutter-wayland-surface.h>
#endif
G_BEGIN_DECLS
@@ -51,11 +50,7 @@ typedef struct _MetaShapedTexturePrivate MetaShapedTexturePrivate;
struct _MetaShapedTextureClass
{
/*< private >*/
-#ifdef HAVE_WAYLAND
- ClutterWaylandSurfaceClass parent_class;
-#else
ClutterActorClass parent_class;
-#endif
};
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]