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 2b2ff47d687785ead69780a9c3bcf05cecff977f..1bb9aac7715c9c7beb9d5085b32000fdfd7fb0dd 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -122,7 +122,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 */
             client_activate(t, FALSE, TRUE, TRUE, TRUE);
             /* if the window is omnipresent then we need to go to its
                desktop */

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 3fdd179be032ac0067d5f85fa4860ff1443c3c23..ad6f7c265928d78e10ad50c37576ee9c71103593 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -103,7 +103,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 */
         client_activate(t, FALSE, TRUE, TRUE, TRUE);
         /* if the window is omnipresent then we need to go to its
            desktop */