bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4de2f4a39227e7fa7d48b41794a6e8ea488f935f
commit 4de2f4a39227e7fa7d48b41794a6e8ea488f935f
Author: Marcel Hollerbach <marcel-hollerb...@t-online.de>
Date: Sat Jun 25 13:06:41 2016 +0200
elm: Always connect to wl when enforced
This is a followup on ca55a920d9a5f6a4274e40fcf901a89e622c3007.
This fixes cnp/dnd for applications started outside of the weston
session. (There are still more problems with dnd and cnp)
---
src/lib/elementary/elm_config.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 204ee34..71cf73a 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -3936,13 +3936,8 @@ _elm_config_sub_init(void)
{
if (!strcmp(ev, "wl")) /* and it is X11 */
{
- if (!have_wl_display) /* if there is no $DISPLAY */
- {
- ERR("$ELM_DISPLAY is set to wl but $WAYLAND_DISPLAY is not
set");
- init_wl = EINA_FALSE;
- }
- else /* if there is */
- init_wl = EINA_TRUE;
+ /* always try to connect to wl when it is enforced */
+ init_wl = EINA_TRUE;
}
else /* not wl */
init_wl = EINA_FALSE;
--
