From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 27 Feb 2008 14:54:26 +0000 (+0100)
Subject: Disable locking for some actions where it didn't make sense.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a991f0d1a81ad9517f9bc56de0d604ba63616db2;p=mikachu%2Fopenbox.git

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

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 87871440..4c3eb86c 100644
--- 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 7b53a6e6..ed1eeedc 100644
--- 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 0ad2bb0d..80ca6b8b 100644
--- 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 20233161..4309acc6 100644
--- 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 04b86362..f6ac1452 100644
--- 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 6cc93797..dbe41d85 100644
--- 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);