summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@beryl-project.org>2007-05-16 16:27:26 +0200
committerDennis Kasprzyk <onestone@beryl-project.org>2007-05-16 16:27:26 +0200
commitfc2e2d966528de375273936172208e2083eb619b (patch)
tree9a16a7c228f06dc361957574c577d89712705ef9
parent9be6ec053e36914cfa7669b16695e92853b5ef4e (diff)
downloadccs-settings-fc2e2d966528de375273936172208e2083eb619b.tar.gz
ccs-settings-fc2e2d966528de375273936172208e2083eb619b.tar.bz2
support for new Conflict features
-rw-r--r--src/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 4e61ab4..5c0ece8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -458,7 +458,8 @@ Bool activation_conflicts(gchar * plugin,gboolean active)
break;
case ConflictFeatureNeeded:
case ConflictPluginNeeded:
- case ConflictSameFeature:
+ case ConflictFeature:
+ case ConflictPlugin:
if (!set_plugin_active(cp->data->name,FALSE))
{
return TRUE;