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

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 4d0f220d1320dcc9ada4b8546d26c2aee35ec498..83b3e010d3bb437b44381b2daf4a54e55da77f09 100644 (file)
--- 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