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

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 6c8957c81eca6370814f35a86abe42834b280d1e..0ea51cb505b56850ddd7b01bd714c812ccdd128c 100644 (file)
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -54,12 +54,14 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             (data->context != OB_FRAME_CONTEXT_CLIENT &&
              data->context != OB_FRAME_CONTEXT_FRAME))
         {
-            if (o->stop_int)
-                actions_interactive_cancel_act();
+            if (!(data->client->iconic && actions_client_locked(data))) {
+                if (o->stop_int)
+                    actions_interactive_cancel_act();
 
-            actions_client_move(data, TRUE);
-            client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE);
-            actions_client_move(data, FALSE);
+                actions_client_move(data, TRUE);
+                client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE);
+                actions_client_move(data, FALSE);
+            }
         }
     } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
         if (o->stop_int)