allow modifierless root keys

[chaz/openbox] / util / epist / actions.cc

diff --git a/util/epist/actions.cc b/util/epist/actions.cc
index 118719508b85174570a0900f160ef13b312364bd..7a895be75e957ea5e74ab1a516850bcd3932f839 100644 (file)
--- a/util/epist/actions.cc
+++ b/util/epist/actions.cc
@@ -39,19 +39,14 @@ Action::Action(enum ActionType type, KeyCode keycode, unsigned int modifierMask,
 
   for (int i = 0; str_types[i] != noaction; ++i) {
     if (type == str_types[i]) {
-      // the first and last characters of the string are quotes, and we need to
-      // get rid of them
-      assert(str.size() >= 2);
-      assert(str[0] == '"');
-      assert(str[str.size() - 1] == '"');
-
-      _stringParam = str.substr(1, str.size() - 2);
+      _stringParam = str;
       return;
     }
   }
-  
+ 
   _numberParam = atoi( str.c_str() );
 
-  if (type == changeWorkspace)  // workspace 1 to the user is workspace 0 to us
+  // workspace 1 to the user is workspace 0 to us
+  if (type == changeWorkspace || type == sendToWorkspace)
     _numberParam--;
 }