From 7d2f0bf1fecb4bc9e65b1e32d86c2a2c64d2b32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Sandmann?= <sandmann@redhat.com>
Date: Wed, 24 May 2006 17:10:31 +0000
Subject: [PATCH] Fix compilation in the non-composited case.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Wed May 24 13:09:49 2006  Søren Sandmann  <sandmann@redhat.com>

        * src/c-window.c: Fix compilation in the non-composited case.
---
 ChangeLog        | 4 ++++
 src/c-window.c   | 4 ++--
 src/compositor.c | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e7f3e18be..4ec503d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 24 13:09:49 2006  Søren Sandmann  <sandmann@redhat.com>
+
+	* src/c-window.c: Fix compilation in the non-composited case.
+
 Wed May 24 12:57:32 2006  Søren Sandmann  <sandmann@redhat.com>
 
 	* src/c-window.c (meta_comp_window_free): return TRUE when the
diff --git a/src/c-window.c b/src/c-window.c
index b6f5995a6..7fe8523c0 100644
--- a/src/c-window.c
+++ b/src/c-window.c
@@ -632,8 +632,6 @@ meta_comp_window_explode (MetaCompWindow *comp_window,
     g_idle_add (update_explosion, info);
 }
 
-#endif
-
 /* new shrinkydink code */
 
 #define SHRINK_TIME 1.0
@@ -683,6 +681,8 @@ meta_comp_window_shrink (MetaCompWindow *comp_window,
     g_idle_add (update_shrink, info);
 }
 
+#endif
+
 #if 0
 /* old shrinkydink minimize effect */
 
diff --git a/src/compositor.c b/src/compositor.c
index 1be021f74..46f47b42e 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -105,6 +105,8 @@ get_xid (MetaWindow *window)
 	return window->xwindow;
 }
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+
 static void
 do_effect (MetaEffect *effect,
 	   gpointer data)
@@ -153,6 +155,8 @@ do_effect (MetaEffect *effect,
     }
 }
 
+#endif /* HAVE_COMPOSITE_EXTENSIONS */
+
 MetaCompositor *
 meta_compositor_new (MetaDisplay *display)
 {