From f4234c92d0176e9ff16acc706c5fe641a5e4abfc Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 27 Feb 2008 15:54:26 +0100
Subject: [PATCH] Disable locking for some actions where it didn't make sense.

---
 openbox/actions/desktop.c     | 6 +++---
 openbox/actions/layer.c       | 2 +-
 openbox/actions/lower.c       | 2 +-
 openbox/actions/omnipresent.c | 2 +-
 openbox/actions/raise.c       | 2 +-
 openbox/actions/raiselower.c  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 5102eb34..37268bba 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -118,6 +118,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
     guint d;
 
+
+
     switch (o->type) {
     case LAST:
         d = screen_last_desktop;
@@ -135,9 +137,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 18556d27..bbfda572 100644
--- a/openbox/actions/layer.c
+++ b/openbox/actions/layer.c
@@ -66,7 +66,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 ffe01333..d34e933b 100644
--- a/openbox/actions/lower.c
+++ b/openbox/actions/lower.c
@@ -15,7 +15,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 8b0fd918..030a0159 100644
--- a/openbox/actions/omnipresent.c
+++ b/openbox/actions/omnipresent.c
@@ -13,7 +13,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 3ee21efa..6837bce2 100644
--- a/openbox/actions/raise.c
+++ b/openbox/actions/raise.c
@@ -15,7 +15,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 9fb3c299..80fc917f 100644
--- a/openbox/actions/raiselower.c
+++ b/openbox/actions/raiselower.c
@@ -14,7 +14,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);
-- 
2.34.1