Disable locking for some actions where it didn't make sense.

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 87871440fc0c267f3d11a86e324434130f01fc52..4c3eb86c123d7d9699c3ce4af83680e640685c1c 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -272,6 +272,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
     guint d;
 
+
+
     switch (o->type) {
     case LAST:
         d = screen_last_desktop;
@@ -296,9 +298,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         gboolean go = TRUE;
 
         actions_client_move(data, TRUE);
-        if (o->send && !actions_client_locked(data) &&
-            client_normal(data->client))
-        {
+        if (o->send && data->client && client_normal(data->client)) {
             client_set_desktop(data->client, d, o->follow, FALSE);
             go = o->follow;
         }

diff --git a/openbox/actions/layer.c b/openbox/actions/layer.c
index 7b53a6e60020e12cbba776285569c373d0e7ebee..ed1eeedc0462c26ed22557edbeb39ef028b4c61e 100644 (file)
--- a/openbox/actions/layer.c
+++ b/openbox/actions/layer.c
@@ -83,7 +83,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 {
     Options *o = options;
 
-    if (!actions_client_locked(data)) {
+    if (data->client) {
         ObClient *c = data->client;
 
         actions_client_move(data, TRUE);

diff --git a/openbox/actions/lower.c b/openbox/actions/lower.c
index 0ad2bb0d0f3539770c9689aecb7a15355fba0024..80ca6b8bcf9fc22c2d229e9f1b2cddb4c299769e 100644 (file)
--- a/openbox/actions/lower.c
+++ b/openbox/actions/lower.c
@@ -14,7 +14,7 @@ void action_lower_startup(void)
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
-    if (!actions_client_locked(data)) {
+    if (data->client) {
         actions_client_move(data, TRUE);
         stacking_lower(CLIENT_AS_WINDOW(data->client));
         actions_client_move(data, FALSE);

diff --git a/openbox/actions/omnipresent.c b/openbox/actions/omnipresent.c
index 20233161d887a076f22da4bbbe5cd511a00b00e1..4309acc642231a0ee35f555af2108d060a2a9720 100644 (file)
--- a/openbox/actions/omnipresent.c
+++ b/openbox/actions/omnipresent.c
@@ -12,7 +12,7 @@ void action_omnipresent_startup(void)
 /* Always return FALSE because its not interactive */
 static gboolean run_func_toggle(ObActionsData *data, gpointer options)
 {
-    if (!actions_client_locked(data)) {
+    if (data->client) {
         actions_client_move(data, TRUE);
         client_set_desktop(data->client,
                            data->client->desktop == DESKTOP_ALL ?

diff --git a/openbox/actions/raise.c b/openbox/actions/raise.c
index 04b86362643d546778906dda2aaf1fa3c79b0511..f6ac1452a43120cef1b12e41368985eb6fbe1ef3 100644 (file)
--- a/openbox/actions/raise.c
+++ b/openbox/actions/raise.c
@@ -12,7 +12,7 @@ void action_raise_startup(void)
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
-    if (!actions_client_locked(data)) {
+    if (data->client) {
         actions_client_move(data, TRUE);
         stacking_raise(CLIENT_AS_WINDOW(data->client));
         actions_client_move(data, FALSE);

diff --git a/openbox/actions/raiselower.c b/openbox/actions/raiselower.c
index 6cc937979dc7cad5b177e6240ed9519a4be88c09..dbe41d854028e7239c377e1cdb6f21aa410ded28 100644 (file)
--- a/openbox/actions/raiselower.c
+++ b/openbox/actions/raiselower.c
@@ -11,7 +11,7 @@ void action_raiselower_startup(void)
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
-    if (!actions_client_locked(data)) {
+    if (data->client) {
         actions_client_move(data, TRUE);
         stacking_restack_request(data->client, NULL, Opposite);
         actions_client_move(data, FALSE);