X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_menu.c;h=cf556744a35d0fca46910cab7623d5d28cca6b78;hb=d3e9fc8941831477b50678b9bd676e29f4bed1a7;hp=fbca23d17b4ff44f7793bb6cadcb32e59055ba1f;hpb=d519deeb2e24ba27664a231c6579bee1e02b4ebb;p=chaz%2Fopenbox

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index fbca23d1..cf556744 100644
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -352,7 +352,7 @@ static void client_menu_place(ObMenuFrame *frame, gint *x, gint *y,
     }
 }
 
-void client_menu_startup()
+void client_menu_startup(void)
 {
     ObMenu *menu;
     ObMenuEntry *e;
@@ -377,8 +377,12 @@ void client_menu_startup()
     menu_set_place_func(menu, client_menu_place);
     menu_set_execute_func(menu, client_menu_execute);
 
+    menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
+
+    menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME);
+
     e = menu_add_normal(menu, CLIENT_RESTORE, _("R_estore"), NULL, TRUE);
-    e->data.normal.mask = ob_rr_theme->max_toggled_mask; 
+    e->data.normal.mask = ob_rr_theme->max_toggled_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;
@@ -398,7 +402,7 @@ void client_menu_startup()
         ob_rr_theme->menu_disabled_selected_color;
 
     e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Ma_ximize"), NULL, TRUE);
-    e->data.normal.mask = ob_rr_theme->max_mask; 
+    e->data.normal.mask = ob_rr_theme->max_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;
@@ -411,12 +415,6 @@ void client_menu_startup()
 
     menu_add_separator(menu, -1, NULL);
 
-    menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
-
-    menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME);
-
-    menu_add_separator(menu, -1, NULL);
-
     e = menu_add_normal(menu, CLIENT_CLOSE, _("_Close"), NULL, TRUE);
     e->data.normal.mask = ob_rr_theme->close_mask;
     e->data.normal.mask_normal_color = ob_rr_theme->menu_color;