From: Marcel Hollerbach <marcel-hollerbach@t-online.de>
Date: Sat, 25 Jun 2016 11:06:41 +0000 (+0200)
Subject: elm: Always connect to wl when enforced
X-Git-Tag: upstream/1.20.0~5512
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4de2f4a39227e7fa7d48b41794a6e8ea488f935f;p=platform%2Fupstream%2Fefl.git

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)
---

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;