From c749f7b6fb9ba270a99a7568f85dfd495ab62e30 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 19 Nov 2013 11:22:49 -0500
Subject: [PATCH] Revert "ff"

This reverts commit 74462133ca7e85aabaac634517dbd5dd0a7742c2.

Pushed by accident, if it wasn't obvious...
---
 src/compositor/meta-surface-actor.c           |  4 +++-
 src/compositor/meta-surface-content-wayland.c | 13 -------------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 src/compositor/meta-surface-content-wayland.c

diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c
index 536b83d58..40177ad17 100644
--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -20,7 +20,9 @@
 
 struct _MetaSurfaceActorPrivate
 {
-  MetaSurfaceContentWayland *main_content;
+  MetaShapedTexture *texture;
+  MetaWaylandBuffer *buffer;
+  Pixmap pixmap;
 };
 
 G_DEFINE_TYPE (MetaSurfaceActor, meta_surface_actor, CLUTTER_TYPE_ACTOR);
diff --git a/src/compositor/meta-surface-content-wayland.c b/src/compositor/meta-surface-content-wayland.c
deleted file mode 100644
index 50330b0cf..000000000
--- a/src/compositor/meta-surface-content-wayland.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#include "config.h"
-
-struct _MetaSurfaceContentWayland {
-  MetaShapedTexture *texture;
-  MetaWaylandSurface *surface;
-};
-
-MetaSurfaceContentWayland *
-meta_surface_content_wayland_new (MetaWaylandSurface *surface)
-{
-}