--- nvidia.py.original	2007-08-24 03:08:48.000000000 -0400
+++ nvidia.py.153800	2007-11-01 12:09:39.000000000 -0400
@@ -35,10 +35,23 @@
         return "nvidia" in self._modules
 
     def enable_config_hook(self):
         # compiz does not work otherwise
         self.xorg_conf.getSections('Screen')[0].defaultdepth = 24
+        # Add other items needed for compiz and Xgl to the screen so they will be undisturbed by displayconfig-gtk
+        # Addresses Ubuntu Bug Report 153800
+        sect=self.xorg_conf.getSections('Screen')[0] # Continue to assume the important screen is the first one
+        sect.option.removeOptionByName("AllowGLXWithComposite")
+        sect.option.appendOptionRow(["AllowGLXWithComposite", "True"])
+        sect.option.removeOptionByName("AddARGBGLXVisuals")
+        sect.option.appendOptionRow(["AddARGBGLXVisuals", "True"])
+        # I don't believe AddARGBVisuals is a valid option, but it is added now without apparent problem
+        # AddARGBGLXVisuals should also be ignored by the nvidia-legacy driver
+        sect.option.removeOptionByName("AddARGBVisuals")
+        sect.option.appendOptionRow(["AddARGBVisuals", "True"])
+        sect.option.removeOptionByName("NoLogo")
+        sect.option.appendOptionRow(["NoLogo", "True"])
 
 class LegacyNvidiaDriver(NvidiaDriver):
     is_handler = True
 
     name = "nvidia_legacy"