diff -Nur -x '*.orig' -x '*~' compizconfig-settings-manager-0.8.2//ccm/Conflicts.py compizconfig-settings-manager-0.8.2.new//ccm/Conflicts.py
--- compizconfig-settings-manager-0.8.2//ccm/Conflicts.py	2009-03-05 11:28:19.000000000 +0800
+++ compizconfig-settings-manager-0.8.2.new//ccm/Conflicts.py	2010-10-22 15:32:36.172206918 +0800
@@ -318,7 +318,7 @@
             
             elif conflict[0] == 'RequiresFeature':
                 answer, choice = self.AskUser(self.Plugin, conflict)
-                if ret == gtk.RESPONSE_YES:
+                if answer == gtk.RESPONSE_YES:
                     for plg in conflict[2]:
                         if plg.ShortDesc == choice:
                             enableConflicts = plg.EnableConflicts
@@ -467,7 +467,7 @@
             widgets.append(cmb)
 
             okMsg = _("Enable these plugins")
-            cancelMsg_("Don't enable %(plugin)s") % msg_dict
+            cancelMsg = _("Don't enable %(plugin)s") % msg_dict
         
         elif conflict[0] == 'RequiresPlugin':
             msg = _("<b>%(plugin)s</b> requires the plugin <b>%(require)s</b>.")