handle locked windows in client list menus also. this is a really stupid way of doing it.

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index c26b6fa036f3da35c874d068c07b67e50ee13b07..395d6d08af35f755d724c51e52ea55f679fcd7bd 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -119,7 +119,7 @@ static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
     }
     else {
         ObClient *t = self->data.normal.data;
-        if (t) { /* it's set to NULL if its destroyed */
+        if (t && !t->locked) { /* it's set to NULL if its destroyed */
             gboolean here = state & ShiftMask;
 
             client_activate(t, TRUE, here, TRUE, TRUE, TRUE);

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index f3df2a5aec1ba5a4e209bfad744e006cfd6e5ad3..92916cf5d18df2f30daccca549d93ea8529c3974 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -99,7 +99,7 @@ static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f,
                               ObClient *c, guint state, gpointer data)
 {
     ObClient *t = self->data.normal.data;
-    if (t) { /* it's set to NULL if its destroyed */
+    if (t && !t->locked) { /* it's set to NULL if its destroyed */
         gboolean here = state & ShiftMask;
 
         client_activate(t, TRUE, here, TRUE, TRUE, TRUE);