From: Mikael Magnusson <mikachu@gmail.com>
Date: Thu, 19 Feb 2009 16:52:57 +0000 (+0100)
Subject: handle locked windows in client list menus also. this is a really stupid way of doing it.
X-Git-Tag: mikabox-3.4.7.2~15
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b306298558823167bc4e15d4def8ff21381135fb;p=mikachu%2Fopenbox.git

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 2b2ff47d..1bb9aac7 100644
--- 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 3fdd179b..ad6f7c26 100644
--- 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 */