weston: Make the shell entrypoint specific
This avoids loading a shell as a module, so we are sure to have only one
shell loaded at a time.
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
diff --git a/compositor/main.c b/compositor/main.c
index af093f1..74b404b 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -829,6 +829,21 @@
}
static int
+wet_load_shell(struct weston_compositor *compositor,
+ const char *name, int *argc, char *argv[])
+{
+ int (*shell_init)(struct weston_compositor *ec,
+ int *argc, char *argv[]);
+
+ shell_init = wet_load_module_entrypoint(name, "wet_shell_init");
+ if (!shell_init)
+ return -1;
+ if (shell_init(compositor, argc, argv) < 0)
+ return -1;
+ return 0;
+}
+
+static int
load_modules(struct weston_compositor *ec, const char *modules,
int *argc, char *argv[])
{
@@ -1895,7 +1910,7 @@
weston_config_section_get_string(section, "shell", &shell,
"desktop-shell.so");
- if (load_modules(ec, shell, &argc, argv) < 0)
+ if (wet_load_shell(ec, shell, &argc, argv) < 0)
goto out;
weston_config_section_get_string(section, "modules", &modules, "");