a combined client_list_menu, use as client-list-combined-menu in your rc.xml. needs...

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index 34150391fe8e760fb7eb9b0354cc77d39787c420..243fc55b35119c52a22b7e69b725ab3db53e7632 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -30,6 +30,7 @@
 #include "misc.h"
 #include "client_menu.h"
 #include "client_list_menu.h"
+#include "client_list_combined_menu.h"
 #include "parser/parse.h"
 
 typedef struct _ObMenuParseState ObMenuParseState;
@@ -71,6 +72,7 @@ void menu_startup(gboolean reconfig)
                                       (GDestroyNotify)menu_destroy_hash_value);
 
     client_list_menu_startup(reconfig);
+    client_list_combined_menu_startup(reconfig);
     client_menu_startup();
 
     menu_parse_inst = parse_startup();
@@ -112,6 +114,7 @@ void menu_shutdown(gboolean reconfig)
     menu_parse_inst = NULL;
 
     client_list_menu_shutdown(reconfig);
+    client_list_combined_menu_shutdown(reconfig);
 
     menu_frame_hide_all();
     g_hash_table_destroy(menu_hash);