merge r6384 from trunk

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index 9e4457e549c34202147b690df50569eaeba3eede..3699e2128dc07f7e7f3d14c52b9d54f212c7c8b3 100644 (file)
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -392,12 +392,6 @@ void client_menu_startup()
         ob_rr_theme->menu_disabled_selected_color;
 
     e = menu_add_normal(menu, CLIENT_SHADE, _("&Roll up/down"), NULL, TRUE);
-    e->data.normal.mask = ob_rr_theme->shade_mask; 
-    e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
-    e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
-    e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
-    e->data.normal.mask_disabled_selected_color =
-        ob_rr_theme->menu_disabled_selected_color;
 
     menu_add_normal(menu, CLIENT_DECORATE, _("Un/&Decorate"), NULL, TRUE);