menu: s/menu_open/menu_open_root/

...to be consistent with the 'close' equivalent

diff --git a/include/menu/menu.h b/include/menu/menu.h
index 914fa186a826a66a635ac977bc0f70c95339e76c..e421a4da05de1ce026293de4fca79c01ca099c65 100644 (file)
--- a/include/menu/menu.h
+++ b/include/menu/menu.h
@@ -81,14 +81,14 @@ void menu_finish(struct server *server);
 struct menu *menu_get_by_id(struct server *server, const char *id);
 
 /**
- * menu_open - open menu on position (x, y)
+ * menu_open_root - open menu on position (x, y)
  *
  * This function will close server->menu_current, open the
  * new menu and assign @menu to server->menu_current.
  *
  * Additionally, server->input_mode wil be set to LAB_INPUT_STATE_MENU.
  */
-void menu_open(struct menu *menu, int x, int y);
+void menu_open_root(struct menu *menu, int x, int y);
 
 /**
  * menu_process_cursor_motion

diff --git a/src/action.c b/src/action.c
index 3723e42b72a28d48e4458cd0b7ceaeed786983c8..61e28f27a54131eed73031ccc81daad5b9ad7c9a 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -605,7 +605,7 @@ show_menu(struct server *server, struct view *view,
 
        /* Replaced by next show_menu() or cleaned on view_destroy() */
        menu->triggered_by_view = view;
-       menu_open(menu, x, y);
+       menu_open_root(menu, x, y);
 }
 
 static struct view *

diff --git a/src/menu/menu.c b/src/menu/menu.c
index c37ebc3b518b41e2f6411af3d86aa5e7b2275b57..722f7d5b5b1673118c460981b64c7a24a04d77a1 100644 (file)
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -842,7 +842,7 @@ menu_close(struct menu *menu)
 }
 
 void
-menu_open(struct menu *menu, int x, int y)
+menu_open_root(struct menu *menu, int x, int y)
 {
        assert(menu);
        if (menu->server->menu_current) {