From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Tue, 6 Dec 2022 10:54:55 +0000 (+0100)
Subject: menu: Add generic menu_init() entry point
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=ccf68c5950701f930a324987cf926cd8088a8ca2;p=proto%2Flabwc.git

menu: Add generic menu_init() entry point
---

diff --git a/include/menu/menu.h b/include/menu/menu.h
index 5586e65f..bbb4905e 100644
--- 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 b7d7bbb3..3cc82e81 100644
--- 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 d0ad02c6..ce9f39eb 100644
--- 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);
 }