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

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 5102eb34c71dd6cdc1b17160aa0a981d062c3133..37268bba9900c42d29fb4ffbb450f68168388c9b 100644 (file)
--- 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 18556d276fe7c22e98f199e875a532da9e01e6bf..bbfda57218f122ae1784dc11ba03c9372d4cebf1 100644 (file)
--- 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 ffe01333ae7d77e4cec54559c96f9ad996bb4523..d34e933bc738a9e86203fb45d9fb26223421aa1e 100644 (file)
--- 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 8b0fd918ccefee8c15ddae7d5e0817841efacd47..030a01592b9857df888dd768440cc964024de8eb 100644 (file)
--- 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 3ee21efadea433ca51cdac55c8bd592f15fc315f..6837bce2564916e2bc8bfe1550bfc9c1621296b7 100644 (file)
--- 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 9fb3c29910e282ea6df48850cafb46e9427c0a9b..80fc917fc328db62e7b8bab7015625dccb9110b6 100644 (file)
--- 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);