summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Niklaus <marex@opencompositing.org>2007-06-15 00:27:02 +0200
committerPatrick Niklaus <marex@opencompositing.org>2007-06-15 00:27:02 +0200
commitef0357018fd95a0e99b86700e9d163fc803138b8 (patch)
tree44c246ce78e368ca8593759eed0d596ab3b18a8f
parent661f732fdee2b7f0ced7330ed5f859c0ec0a332c (diff)
downloadccsm-ef0357018fd95a0e99b86700e9d163fc803138b8.tar.gz
ccsm-ef0357018fd95a0e99b86700e9d163fc803138b8.tar.bz2
Made plugin conflicts work
-rwxr-xr-xccsm.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/ccsm.in b/ccsm.in
index 1851d18..13569de 100755
--- a/ccsm.in
+++ b/ccsm.in
@@ -1092,7 +1092,7 @@ def HandlePluginConflicts(conflicts):
pluginList = ', '.join("\"%s\"" % plugin.ShortDesc for plugin in conflict[2])
msg = "The plugin you are trying to disable is required by the plugins <b>%s</b>.\n" +\
"Click OK to disable these plugins or Cancel to stop trying to disable this plugin."
- msg = msg % plist
+ msg = msg % pluginList
dlg.set_markup(msg)
dlg.show_all()
@@ -1101,7 +1101,7 @@ def HandlePluginConflicts(conflicts):
if ret == gtk.RESPONSE_OK:
for plugin in conflict[2]:
- disableConflicts = p.DisableConflicts
+ disableConflicts = plugin.DisableConflicts
if HandlePluginConflicts(disableConflicts):
plugin.Enabled = False
else: