From: Mikael Magnusson <mikachu@gmail.com>
Date: Sat, 4 Oct 2008 10:49:56 +0000 (+0200)
Subject: Don't allow deiconifying locked windows via the focus action.
X-Git-Tag: mikabox-3.4.7.2~24^2~2
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ec54e1fa6a0855353e2f980afc124d83413996dc;p=mikachu%2Fopenbox.git

Don't allow deiconifying locked windows via the focus action.
---

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 4d0f220d..83b3e010 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -43,9 +43,11 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             (data->context != OB_FRAME_CONTEXT_CLIENT &&
              data->context != OB_FRAME_CONTEXT_FRAME))
         {
-            actions_client_move(data, TRUE);
-            client_activate(data->client, o->here, FALSE, FALSE, TRUE);
-            actions_client_move(data, FALSE);
+            if (!(data->client->iconic && actions_client_locked(data))) {
+                actions_client_move(data, TRUE);
+                client_activate(data->client, o->here, FALSE, FALSE, TRUE);
+                actions_client_move(data, FALSE);
+            }
         }
     } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
         /* focus action on the root window. make keybindings work for this