diff --git a/ChangeLog b/ChangeLog
index ff9753bff..b9925c7e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 16 11:55:20 2006  Søren Sandmann  <sandmann@redhat.com>
+
+	* src/compositor.c (meta_compositor_manage_screen): Really turn
+	off draw-in-a-loop.
+
 2006-01-15  Kyle Ambroff  <kambroff@csus.edu>
 
 	* src/workspace.c (focus_ancestor_or_mru_window): 
diff --git a/src/compositor.c b/src/compositor.c
index 83ee23840..1f3e3f468 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -580,8 +580,11 @@ update (gpointer data)
   /* FIXME: we should probably grab the server around the raise/swap */
   
   ws_window_gl_swap_buffers (gl_window);
+  glFinish();
 
   scr_info->idle_id = 0;
+
+  g_print ("returning FALSE\n");
   
   return FALSE;
 }
@@ -734,8 +737,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   
   ws_sync (compositor->ws);
   
-  g_idle_add (update, screen);
-  
 #endif
 }