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

compositor: init shell after xserver

Browse Source 
This reverts a snip from commit d012e9df. On that commit, it was lost the
ability of calling X applications from desktop panel; xserver module
was setting DISPLAY only later, after panel was already launched.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
Tiago Vignatti
2012-04-16 17:31:44 +03:00
committed by Kristian Høgsberg
parent be14326efd
commit e4faa2ab05
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+3 -3
View File
@@ -2601,9 +2601,6 @@ int main(int argc, char *argv[])
ec->option_idle_time = idle_time; ec->option_idle_time = idle_time;
ec->idle_time = idle_time; ec->idle_time = idle_time;
if (shell_init(ec) < 0)
exit(EXIT_FAILURE);
xserver_init = NULL; xserver_init = NULL;
if (xserver) if (xserver)
xserver_init = load_module("xserver-launcher.so", xserver_init = load_module("xserver-launcher.so",
@@ -2612,6 +2609,9 @@ int main(int argc, char *argv[])
if (xserver_init) if (xserver_init)
xserver_init(ec); xserver_init(ec);
if (shell_init(ec) < 0)
exit(EXIT_FAILURE);
if (wl_display_add_socket(display, socket_name)) { if (wl_display_add_socket(display, socket_name)) {
fprintf(stderr, "failed to add socket: %m\n"); fprintf(stderr, "failed to add socket: %m\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);