From: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon, 13 Aug 2012 17:56:03 +0000 (-0400)
Subject: compositor: Set WAYLAND_DISPLAY only after creating backend
X-Git-Tag: submit/trunk/20120814.155504~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33d7509d374ae649f2684d62bbe7faa5bc42687c;p=profile%2Fivi%2Fweston.git

compositor: Set WAYLAND_DISPLAY only after creating backend

The wayland backend needs to connect to the original WAYLAND_DISPLAY
before we overwrite it.

https://bugs.freedesktop.org/show_bug.cgi?id=53064
---

diff --git a/src/compositor.c b/src/compositor.c
index 30a1f4f..6e8afb6 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3535,8 +3535,6 @@ int main(int argc, char *argv[])
 
 	config_file = config_file_path("weston.ini");
 	parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
-	if (socket_name)
-		setenv("WAYLAND_DISPLAY", socket_name, 1);
 
 	backend_init = load_module(backend, "backend_init", &backend_module);
 	if (!backend_init)
@@ -3576,6 +3574,9 @@ 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, "shell_init", &shell_module);