mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Always set WAYLAND_DISPLAY

Browse Source 
We used to only set it if we were given an argument on the command line.
It's useful to always set it so nested weston works out of the box.
This commit is contained in:
Kristian Høgsberg 2012-09-11 14:29:47 -04:00
parent a4624f69b2
commit eb00e2e24b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/compositor.c
View File

@ -2994,7 +2994,7 @@ int main(int argc, char *argv[])
int32_t idle_time = 300;
int32_t xserver = 0;
int32_t help = 0;
char *socket_name = NULL;
char *socket_name = "wayland-0";
char *config_file;
const struct config_key shell_config_keys[] = {
@ -3088,6 +3088,8 @@ int main(int argc, char *argv[])
ec->option_idle_time = idle_time;
ec->idle_time = idle_time;
setenv("WAYLAND_DISPLAY", socket_name, 1);
module_init = NULL;
if (xserver)
module_init = load_module("xwayland.so", "module_init");
@ -3096,9 +3098,6 @@ int main(int argc, char *argv[])
goto out;
}
if (socket_name)
setenv("WAYLAND_DISPLAY", socket_name, 1);
if (!shell)
shell = "desktop-shell.so";
module_init = load_module(shell, "module_init");