summaryrefslogtreecommitdiff
path: root/src/action.cpp
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2008-10-13 11:56:14 +0200
committerDanny Baumann <dannybaumann@web.de>2008-10-13 11:56:14 +0200
commit7a082ced9a8e9d72bb38275f54d2665bef772ba8 (patch)
tree35ea8c5db62a53d92efb37c242b178177f28d01b /src/action.cpp
parentc1d48a4ef260ebbd225748714cf5e6bce48dda7d (diff)
downloadunity-window-decorator-7a082ced9a8e9d72bb38275f54d2665bef772ba8.tar.gz
unity-window-decorator-7a082ced9a8e9d72bb38275f54d2665bef772ba8.tar.bz2
Conversion is successful if key or button bindings are equal to "Disabled".
Diffstat (limited to 'src/action.cpp')
-rw-r--r--src/action.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/action.cpp b/src/action.cpp
index fc672ff..78b67ae 100644
--- a/src/action.cpp
+++ b/src/action.cpp
@@ -448,9 +448,15 @@ CompAction::keyFromString (const CompString &str)
bool retval = priv->key.fromString (str);
if (retval)
+ {
priv->type = CompAction::BindingTypeKey;
+ }
else
+ {
priv->type = CompAction::BindingTypeNone;
+ if (str == "Disabled")
+ retval = true;
+ }
return retval;
}
@@ -471,8 +477,10 @@ CompAction::buttonFromString (const CompString &str)
else
{
priv->type = CompAction::BindingTypeNone;
+ if (str == "Disabled")
+ retval = true;
}
-
+
return retval;
}