was not disabling the normal layer when appropriate

[chaz/openbox] / plugins / menu / client_menu.c

diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index 32277047c2da05c4e43e6660eb46072eca84cf62..2514c7c2c98b19177c4032742107d259b4add367 100644 (file)
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -83,11 +83,14 @@ static void layer_update(ObMenuFrame *frame, gpointer data)
             e->data.normal.enabled = !!frame->client;
     }
 
+    if (!frame->client)
+        return;
+
     e = menu_find_entry_id(menu, LAYER_TOP);
     e->data.normal.enabled = !frame->client->above;
 
     e = menu_find_entry_id(menu, LAYER_NORMAL);
-    e->data.normal.enabled = !(frame->client->above || frame->client->below);
+    e->data.normal.enabled = (frame->client->above || frame->client->below);
 
     e = menu_find_entry_id(menu, LAYER_BOTTOM);
     e->data.normal.enabled = !frame->client->below;
@@ -162,7 +165,7 @@ void plugin_startup()
     acts = g_slist_prepend(NULL, action_from_string("Iconify"));
     menu_add_normal(CLIENT_MENU_NAME, CLIENT_ICONIFY, _("Iconify"), acts);
 
-    acts = g_slist_prepend(NULL, action_from_string("Maximize"));
+    acts = g_slist_prepend(NULL, action_from_string("ToggleMaximizeFull"));
     menu_add_normal(CLIENT_MENU_NAME, CLIENT_MAXIMIZE, _("Maximize"), acts);
 
     acts = g_slist_prepend(NULL, action_from_string("Raise"));