menu: Add generic menu_init() entry point

diff --git a/include/menu/menu.h b/include/menu/menu.h
index 5586e65f2bae9f79005069d34d177d755b779229..bbb4905eb1eced7a88fc8c5ff66ae40c42a6e7bc 100644 (file)
--- a/include/menu/menu.h
+++ b/include/menu/menu.h
@@ -61,8 +61,7 @@ struct menu {
        struct view *triggered_by_view;  /* may be NULL */
 };
 
-void menu_init_rootmenu(struct server *server);
-void menu_init_windowmenu(struct server *server);
+void menu_init(struct server *server);
 void menu_finish(void);
 
 /**

diff --git a/src/main.c b/src/main.c
index b7d7bbb3d27f77b346e7bc37c0b20a06f9fb17f1..3cc82e81ac1ce1287b627dfc19854cdf51a792b1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -169,8 +169,7 @@ main(int argc, char *argv[])
        rc.theme = &theme;
        server.theme = &theme;
 
-       menu_init_rootmenu(&server);
-       menu_init_windowmenu(&server);
+       menu_init(&server);
 
        session_autostart_init(rc.config_dir);
        if (startup_cmd) {

diff --git a/src/menu/menu.c b/src/menu/menu.c
index d0ad02c6956b1a47b44c6c9b1ee8bcf3dc69e0f8..ce9f39eb0a809156326e5d821415ae9f91d964d3 100644 (file)
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -575,8 +575,8 @@ menu_hide_submenu(const char *id)
        }
 }
 
-void
-menu_init_rootmenu(struct server *server)
+static void
+init_rootmenu(struct server *server)
 {
        parse_xml("menu.xml", server);
        struct menu *menu = menu_get_by_id("root-menu");
@@ -594,8 +594,8 @@ menu_init_rootmenu(struct server *server)
        }
 }
 
-void
-menu_init_windowmenu(struct server *server)
+static void
+init_windowmenu(struct server *server)
 {
        struct menu *menu = menu_get_by_id("client-menu");
 
@@ -640,6 +640,13 @@ menu_init_windowmenu(struct server *server)
        }
 }
 
+void
+menu_init(struct server *server)
+{
+       init_rootmenu(server);
+       init_windowmenu(server);
+}
+
 void
 menu_finish(void)
 {
@@ -799,6 +806,5 @@ menu_reconfigure(struct server *server)
 {
        menu_finish();
        server->menu_current = NULL;
-       menu_init_rootmenu(server);
-       menu_init_windowmenu(server);
+       menu_init(server);
 }