From: Mikael Magnusson <mikachu@gmail.com>
Date: Fri, 8 Jan 2010 18:51:57 +0000 (+0100)
Subject: handle locked windows in client list menus also. this is a really stupid way of doing it.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=7d3ed12861b04afd2b063f1a8d9ce99fe91bf97a;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 c26b6fa0..395d6d08 100644
--- 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 f3df2a5a..92916cf5 100644
--- 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);