From 21d5a43c2919b853c5dff72a83e668f04aa23ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Sandmann?= <sandmann@redhat.com>
Date: Fri, 31 Mar 2006 17:25:02 +0000
Subject: [PATCH] Only use magnifier when USE_MAGNIFIER is set.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fri Mar 31 12:24:26 2006  Søren Sandmann  <sandmann@redhat.com>

	* src/c-screen.c (meta_screen_info_redirect): Only use magnifier
	when USE_MAGNIFIER is set.

	* src/compositor.c (meta_compositor_free_window): Only wobble when
	USE_WOBBLE is set.
---
 ChangeLog        |  8 ++++++++
 src/c-screen.c   |  6 +++++-
 src/compositor.c | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 00478eb3b..35531aa95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Mar 31 12:24:26 2006  Søren Sandmann  <sandmann@redhat.com>
+
+	* src/c-screen.c (meta_screen_info_redirect): Only use magnifier
+	when USE_MAGNIFIER is set.
+
+	* src/compositor.c (meta_compositor_free_window): Only wobble when
+	USE_WOBBLE is set. 
+
 Fri Mar 31 12:13:21 2006  Søren Sandmann  <sandmann@redhat.com>
 
 	* src/c-screen.c (meta_screen_info_redirect): Don't hardcode
diff --git a/src/c-screen.c b/src/c-screen.c
index 9b1346b68..dc5e1ec8c 100644
--- a/src/c-screen.c
+++ b/src/c-screen.c
@@ -321,7 +321,11 @@ meta_screen_info_redirect (MetaScreenInfo *info)
     target.height = screen_h / 4;
     
     info->magnifier = cm_magnifier_new (info->stacker, &source, &target);
-    cm_magnifier_set_active (info->magnifier, TRUE);
+
+    if (g_getenv ("USE_MAGNIFIER"))
+	cm_magnifier_set_active (info->magnifier, TRUE);
+    else
+	cm_magnifier_set_active (info->magnifier, FALSE);
     
     info->repaint_id =
 	g_signal_connect (info->magnifier, "need_repaint",
diff --git a/src/compositor.c b/src/compositor.c
index e1dde075b..1c614ca06 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1344,7 +1344,12 @@ meta_compositor_begin_move (MetaCompositor *compositor,
   MetaRectangle rect;
   MoveInfo *move_info;
 
+#if 0
   g_print ("begin move\n");
+#endif
+
+  if (!g_getenv ("USE_WOBBLY"))
+      return;
   
   move_info = g_new0 (MoveInfo, 1);
 
@@ -1400,6 +1405,9 @@ meta_compositor_update_move (MetaCompositor *compositor,
 #ifdef HAVE_COMPOSITE_EXTENSIONS
     MoveInfo *move_info = find_info (window);
 
+    if (!g_getenv ("USE_WOBBLY"))
+	return;
+
     model_update_move (move_info->model, x, y);
 #endif
 }
@@ -1411,6 +1419,9 @@ meta_compositor_end_move (MetaCompositor *compositor,
 #ifdef HAVE_COMPOSITE_EXTENSIONS
     MoveInfo *info = find_info (window);
 
+    if (!g_getenv ("USE_WOBBLY"))
+	return;
+    
     info->finished = TRUE;
 #endif
 }
@@ -1423,6 +1434,9 @@ meta_compositor_free_window (MetaCompositor *compositor,
 #ifdef HAVE_COMPOSITE_EXTENSIONS
     MoveInfo *info = find_info (window);
 
+    if (!g_getenv ("USE_WOBBLY"))
+	return;
+    
     if (info)
 	info->window_destroyed = TRUE;
 #endif